diff --git a/.m2-tmp/com/liferay/com.liferay.gradle.plugins.defaults/12.0.13/com.liferay.gradle.plugins.defaults-12.0.13.jar b/.m2-tmp/com/liferay/com.liferay.gradle.plugins.defaults/12.0.13/com.liferay.gradle.plugins.defaults-12.0.13.jar
new file mode 100644
index 00000000000000..2053ff5f9b4e18
Binary files /dev/null and b/.m2-tmp/com/liferay/com.liferay.gradle.plugins.defaults/12.0.13/com.liferay.gradle.plugins.defaults-12.0.13.jar differ
diff --git a/.m2-tmp/com/liferay/com.liferay.gradle.plugins.defaults/12.0.13/com.liferay.gradle.plugins.defaults-12.0.13.pom b/.m2-tmp/com/liferay/com.liferay.gradle.plugins.defaults/12.0.13/com.liferay.gradle.plugins.defaults-12.0.13.pom
new file mode 100644
index 00000000000000..164057c099c171
--- /dev/null
+++ b/.m2-tmp/com/liferay/com.liferay.gradle.plugins.defaults/12.0.13/com.liferay.gradle.plugins.defaults-12.0.13.pom
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ com.liferay.gradle.plugins.defaults
+ 12.0.13
+ Liferay Gradle Plugins Defaults
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
+
+ com.github.jk1
+ gradle-license-report
+ 2.0
+ compile
+
+
+ com.gradle.publish
+ plugin-publish-plugin
+ 0.11.0
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins
+ 16.0.60
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.app.javadoc.builder
+ 1.2.6
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.baseline
+ 7.0.5
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.cache
+ 1.0.19
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.change.log.builder
+ 1.1.7
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.dependency.checker
+ 1.0.6
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.go
+ 2.0.1
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.jsdoc
+ 2.0.79
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.patcher
+ 1.0.23
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.poshi.runner
+ 4.0.22
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.testray
+ 1.0.22
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.whip
+ 1.0.10
+ compile
+
+
+ gradle.plugin.com.github.maiflai
+ gradle-scalatest
+ 0.25
+ compile
+
+
+ gradle.plugin.com.github.spotbugs.snom
+ spotbugs-gradle-plugin
+ 4.0.0
+ compile
+
+
+ org.apache.aries.jmx
+ org.apache.aries.jmx.api
+ 1.1.0
+ compile
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ 2.3.2
+ runtime
+
+
+
diff --git a/.m2-tmp/com/liferay/com.liferay.gradle.plugins.jasper.jspc/3.0.1/com.liferay.gradle.plugins.jasper.jspc-3.0.1.jar b/.m2-tmp/com/liferay/com.liferay.gradle.plugins.jasper.jspc/3.0.1/com.liferay.gradle.plugins.jasper.jspc-3.0.1.jar
new file mode 100644
index 00000000000000..3f6a1bc6c7b8c2
Binary files /dev/null and b/.m2-tmp/com/liferay/com.liferay.gradle.plugins.jasper.jspc/3.0.1/com.liferay.gradle.plugins.jasper.jspc-3.0.1.jar differ
diff --git a/.m2-tmp/com/liferay/com.liferay.gradle.plugins.jasper.jspc/3.0.1/com.liferay.gradle.plugins.jasper.jspc-3.0.1.pom b/.m2-tmp/com/liferay/com.liferay.gradle.plugins.jasper.jspc/3.0.1/com.liferay.gradle.plugins.jasper.jspc-3.0.1.pom
new file mode 100644
index 00000000000000..8e5300b513869c
--- /dev/null
+++ b/.m2-tmp/com/liferay/com.liferay.gradle.plugins.jasper.jspc/3.0.1/com.liferay.gradle.plugins.jasper.jspc-3.0.1.pom
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ com.liferay.gradle.plugins.jasper.jspc
+ 3.0.1
+ The Jasper JSPC Gradle plugin lets you run the Liferay Jasper JSPC tool to compile the JavaServer Pages (JSP) files in your project.
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
+
+ com.liferay
+ com.liferay.gradle.util
+ 1.0.49
+ runtime
+
+
+ jakarta.servlet.jsp.jstl
+ jakarta.servlet.jsp.jstl-api
+ 3.0.2
+ runtime
+
+
+ org.apache.tomcat
+ tomcat-jasper
+ 10.1.34
+ runtime
+
+
+ org.glassfish.web
+ jakarta.servlet.jsp.jstl
+ 3.0.1
+ runtime
+
+
+
diff --git a/.m2-tmp/com/liferay/com.liferay.gradle.plugins/16.0.60/com.liferay.gradle.plugins-16.0.60.jar b/.m2-tmp/com/liferay/com.liferay.gradle.plugins/16.0.60/com.liferay.gradle.plugins-16.0.60.jar
new file mode 100644
index 00000000000000..9eff9b5763d4ca
Binary files /dev/null and b/.m2-tmp/com/liferay/com.liferay.gradle.plugins/16.0.60/com.liferay.gradle.plugins-16.0.60.jar differ
diff --git a/.m2-tmp/com/liferay/com.liferay.gradle.plugins/16.0.60/com.liferay.gradle.plugins-16.0.60.pom b/.m2-tmp/com/liferay/com.liferay.gradle.plugins/16.0.60/com.liferay.gradle.plugins-16.0.60.pom
new file mode 100644
index 00000000000000..4b924faff195b2
--- /dev/null
+++ b/.m2-tmp/com/liferay/com.liferay.gradle.plugins/16.0.60/com.liferay.gradle.plugins-16.0.60.pom
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ com.liferay.gradle.plugins
+ 16.0.60
+ Liferay Gradle Plugins
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
+
+ biz.aQute.bnd
+ biz.aQute.bnd.gradle
+ 6.4.0
+ compile
+
+
+ com.liferay
+ com.liferay.ant.bnd
+ 3.2.14
+ compile
+
+
+ com.liferay
+ com.liferay.gogo.shell.client
+ 1.0.0
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.alloy.taglib
+ 2.0.6
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.css.builder
+ 5.0.16
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.db.support
+ 1.1.2
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.jasper.jspc
+ 3.0.1
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.javadoc.formatter
+ 2.0.1
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.lang.builder
+ 3.0.40
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.node
+ 8.1.2
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.rest.builder
+ 1.1.278
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.service.builder
+ 4.0.175
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.source.formatter
+ 5.2.203
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.test.integration
+ 4.0.6
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.tld.formatter
+ 1.0.15
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.tlddoc.builder
+ 2.0.2
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.upgrade.table.builder
+ 3.0.5
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.wsdd.builder
+ 1.0.23
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.wsdl.builder
+ 3.0.4
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.plugins.xsd.builder
+ 1.0.13
+ compile
+
+
+ com.liferay
+ com.liferay.gradle.util
+ 1.0.49
+ compile
+
+
+
diff --git a/.m2-tmp/com/liferay/com.liferay.portal.tools.jakarta.ee.transformer/1.0.0/com.liferay.portal.tools.jakarta.ee.transformer-1.0.0.jar b/.m2-tmp/com/liferay/com.liferay.portal.tools.jakarta.ee.transformer/1.0.0/com.liferay.portal.tools.jakarta.ee.transformer-1.0.0.jar
new file mode 100644
index 00000000000000..3beec410f23e57
Binary files /dev/null and b/.m2-tmp/com/liferay/com.liferay.portal.tools.jakarta.ee.transformer/1.0.0/com.liferay.portal.tools.jakarta.ee.transformer-1.0.0.jar differ
diff --git a/.m2-tmp/com/liferay/com.liferay.portal.tools.jakarta.ee.transformer/1.0.0/com.liferay.portal.tools.jakarta.ee.transformer-1.0.0.pom b/.m2-tmp/com/liferay/com.liferay.portal.tools.jakarta.ee.transformer/1.0.0/com.liferay.portal.tools.jakarta.ee.transformer-1.0.0.pom
new file mode 100644
index 00000000000000..a8a8eebb96e91f
--- /dev/null
+++ b/.m2-tmp/com/liferay/com.liferay.portal.tools.jakarta.ee.transformer/1.0.0/com.liferay.portal.tools.jakarta.ee.transformer-1.0.0.pom
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ com.liferay.portal.tools.jakarta.ee.transformer
+ 1.0.0
+ Liferay Portal Tools Jakarta EE Transformer
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/com.liferay.portletmvc4spring.test/5.2.1.JAKARTA_LIFERAY-PATCHED-1/com.liferay.portletmvc4spring.test-5.2.1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/com.liferay.portletmvc4spring.test/5.2.1.JAKARTA_LIFERAY-PATCHED-1/com.liferay.portletmvc4spring.test-5.2.1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..d7a227956613c6
Binary files /dev/null and b/.m2-tmp/com/liferay/com.liferay.portletmvc4spring.test/5.2.1.JAKARTA_LIFERAY-PATCHED-1/com.liferay.portletmvc4spring.test-5.2.1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/com.liferay.portletmvc4spring.test/5.2.1.JAKARTA_LIFERAY-PATCHED-1/com.liferay.portletmvc4spring.test-5.2.1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/com.liferay.portletmvc4spring.test/5.2.1.JAKARTA_LIFERAY-PATCHED-1/com.liferay.portletmvc4spring.test-5.2.1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..28f36d1f9c8a77
--- /dev/null
+++ b/.m2-tmp/com/liferay/com.liferay.portletmvc4spring.test/5.2.1.JAKARTA_LIFERAY-PATCHED-1/com.liferay.portletmvc4spring.test-5.2.1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ com.liferay.portletmvc4spring.test
+ 5.2.1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/com.sun.xml.bind.jaxb.osgi/2.3.4.JAKARTA_LIFERAY-PATCHED-1/com.sun.xml.bind.jaxb.osgi-2.3.4.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/com.sun.xml.bind.jaxb.osgi/2.3.4.JAKARTA_LIFERAY-PATCHED-1/com.sun.xml.bind.jaxb.osgi-2.3.4.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..5b46810c21bd63
Binary files /dev/null and b/.m2-tmp/com/liferay/com.sun.xml.bind.jaxb.osgi/2.3.4.JAKARTA_LIFERAY-PATCHED-1/com.sun.xml.bind.jaxb.osgi-2.3.4.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/com.sun.xml.bind.jaxb.osgi/2.3.4.JAKARTA_LIFERAY-PATCHED-1/com.sun.xml.bind.jaxb.osgi-2.3.4.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/com.sun.xml.bind.jaxb.osgi/2.3.4.JAKARTA_LIFERAY-PATCHED-1/com.sun.xml.bind.jaxb.osgi-2.3.4.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..1769a9f45856f3
--- /dev/null
+++ b/.m2-tmp/com/liferay/com.sun.xml.bind.jaxb.osgi/2.3.4.JAKARTA_LIFERAY-PATCHED-1/com.sun.xml.bind.jaxb.osgi-2.3.4.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ com.sun.xml.bind.jaxb.osgi
+ 2.3.4.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/jakarta.ws.rs/3.1.0.LIFERAY-PATCHED-1/jakarta.ws.rs-3.1.0.LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/jakarta.ws.rs/3.1.0.LIFERAY-PATCHED-1/jakarta.ws.rs-3.1.0.LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..2e1dbb31b09b7f
Binary files /dev/null and b/.m2-tmp/com/liferay/jakarta.ws.rs/3.1.0.LIFERAY-PATCHED-1/jakarta.ws.rs-3.1.0.LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/jakarta.ws.rs/3.1.0.LIFERAY-PATCHED-1/jakarta.ws.rs-3.1.0.LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/jakarta.ws.rs/3.1.0.LIFERAY-PATCHED-1/jakarta.ws.rs-3.1.0.LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..1ad9d3080dfceb
--- /dev/null
+++ b/.m2-tmp/com/liferay/jakarta.ws.rs/3.1.0.LIFERAY-PATCHED-1/jakarta.ws.rs-3.1.0.LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ jakarta.ws.rs
+ 3.1.0.LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/javax.ccpp.ri/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp.ri-1.0.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/javax.ccpp.ri/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp.ri-1.0.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..0376588343a34a
Binary files /dev/null and b/.m2-tmp/com/liferay/javax.ccpp.ri/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp.ri-1.0.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/javax.ccpp.ri/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp.ri-1.0.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/javax.ccpp.ri/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp.ri-1.0.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..e49264bedc5222
--- /dev/null
+++ b/.m2-tmp/com/liferay/javax.ccpp.ri/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp.ri-1.0.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ javax.ccpp.ri
+ 1.0.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/javax.ccpp/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp-1.0.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/javax.ccpp/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp-1.0.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..d2b3234b0e0146
Binary files /dev/null and b/.m2-tmp/com/liferay/javax.ccpp/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp-1.0.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/javax.ccpp/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp-1.0.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/javax.ccpp/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp-1.0.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..4a7b5cac1394e5
--- /dev/null
+++ b/.m2-tmp/com/liferay/javax.ccpp/1.0.JAKARTA_LIFERAY-PATCHED-1/javax.ccpp-1.0.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ javax.ccpp
+ 1.0.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/nl.captcha.simplecaptcha/1.1.1.JAKARTA_LIFERAY-PATCHED-1/nl.captcha.simplecaptcha-1.1.1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/nl.captcha.simplecaptcha/1.1.1.JAKARTA_LIFERAY-PATCHED-1/nl.captcha.simplecaptcha-1.1.1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..2e665a59dcc0fe
Binary files /dev/null and b/.m2-tmp/com/liferay/nl.captcha.simplecaptcha/1.1.1.JAKARTA_LIFERAY-PATCHED-1/nl.captcha.simplecaptcha-1.1.1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/nl.captcha.simplecaptcha/1.1.1.JAKARTA_LIFERAY-PATCHED-1/nl.captcha.simplecaptcha-1.1.1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/nl.captcha.simplecaptcha/1.1.1.JAKARTA_LIFERAY-PATCHED-1/nl.captcha.simplecaptcha-1.1.1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..308999c6952154
--- /dev/null
+++ b/.m2-tmp/com/liferay/nl.captcha.simplecaptcha/1.1.1.JAKARTA_LIFERAY-PATCHED-1/nl.captcha.simplecaptcha-1.1.1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ nl.captcha.simplecaptcha
+ 1.1.1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extender/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extender-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.aries.cdi.extender/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extender-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..049c8b9f73bd94
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.aries.cdi.extender/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extender-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extender/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extender-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.aries.cdi.extender/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extender-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..3bffd2af56c30c
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.aries.cdi.extender/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extender-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.aries.cdi.extender
+ 1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.el.jsp/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.el.jsp-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.el.jsp/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.el.jsp-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..838819669c8de4
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.el.jsp/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.el.jsp-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.el.jsp/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.el.jsp-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.el.jsp/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.el.jsp-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..cc81bf8d246509
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.el.jsp/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.el.jsp-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.aries.cdi.extension.el.jsp
+ 1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.http/1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.http-1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.http/1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.http-1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..d3371a0e174dc8
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.http/1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.http-1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.http/1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.http-1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.http/1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.http-1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..8e7033cb2d62e4
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.http/1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.http-1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.aries.cdi.extension.http
+ 1.0.3.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..e6a0a6e061c1ee
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..b2e346930a3ee5
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.aries.cdi.extension.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extension.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.aries.cdi.extension.spi
+ 1.1.5.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extra/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extra-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.aries.cdi.extra/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extra-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..75cb7bd391b382
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.aries.cdi.extra/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extra-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.extra/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extra-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.aries.cdi.extra/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extra-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..2067a8b1f644d4
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.aries.cdi.extra/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.extra-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.aries.cdi.extra
+ 1.1.5.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.aries.cdi.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..5aaa9cf3c8b7df
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.aries.cdi.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.aries.cdi.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..d73f30aa274a89
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.aries.cdi.spi/1.1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.spi-1.1.5.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.aries.cdi.spi
+ 1.1.5.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.weld/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.weld-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.aries.cdi.weld/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.weld-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..6edee53d2c7c2c
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.aries.cdi.weld/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.weld-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.aries.cdi.weld/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.weld-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.aries.cdi.weld/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.weld-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..604de3436e9a7c
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.aries.cdi.weld/1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.cdi.weld-1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.aries.cdi.weld
+ 1.1.5.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.aries.jax.rs.whiteboard/2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.jax.rs.whiteboard-2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.aries.jax.rs.whiteboard/2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.jax.rs.whiteboard-2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..d135bb30544d99
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.aries.jax.rs.whiteboard/2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.jax.rs.whiteboard-2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.aries.jax.rs.whiteboard/2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.jax.rs.whiteboard-2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.aries.jax.rs.whiteboard/2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.jax.rs.whiteboard-2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..43afeb1db1196a
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.aries.jax.rs.whiteboard/2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.aries.jax.rs.whiteboard-2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.aries.jax.rs.whiteboard
+ 2.0.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.commons.fileupload/1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.commons.fileupload-1.5.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.commons.fileupload/1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.commons.fileupload-1.5.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..c0d43bd21892e0
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.commons.fileupload/1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.commons.fileupload-1.5.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.commons.fileupload/1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.commons.fileupload-1.5.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.commons.fileupload/1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.commons.fileupload-1.5.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..401f1b1634007d
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.commons.fileupload/1.5.JAKARTA_LIFERAY-PATCHED-1/org.apache.commons.fileupload-1.5.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.commons.fileupload
+ 1.5.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.core/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.core-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.core/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.core-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..6d849928b5b31c
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.core/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.core-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.core/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.core-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.core/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.core-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..c06fa0a1fed520
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.core/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.core-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.core
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.soap/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.soap-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.soap/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.soap-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..d62cca0ccec4b8
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.soap/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.soap-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.soap/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.soap-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.soap/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.soap-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..e0923932abe59b
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.soap/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.soap-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.bindings.soap
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.xml/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.xml-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.xml/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.xml-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..8426989349a96c
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.xml/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.xml-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.xml/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.xml-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.xml/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.xml-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..d8e26585f8c14b
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.bindings.xml/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.bindings.xml-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.bindings.xml
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.databinding.jaxb/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.databinding.jaxb-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.databinding.jaxb/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.databinding.jaxb-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..341f4ecdcdd8a8
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.databinding.jaxb/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.databinding.jaxb-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.databinding.jaxb/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.databinding.jaxb-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.databinding.jaxb/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.databinding.jaxb-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..f3db7ca65ac67b
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.databinding.jaxb/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.databinding.jaxb-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.databinding.jaxb
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..7e283f6a2bd802
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..8c96fa95ea4b67
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.frontend.jaxrs
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxws/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxws-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxws/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxws-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..194a5a66386119
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxws/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxws-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxws/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxws-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxws/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxws-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..91fbc1ff20c5f7
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.jaxws/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.jaxws-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.frontend.jaxws
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.simple/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.simple-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.simple/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.simple-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..910a6e7f469bea
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.simple/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.simple-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.simple/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.simple-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.simple/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.simple-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..43b40ec2563125
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.frontend.simple/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.frontend.simple-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.frontend.simple
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.client/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.client-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.client/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.client-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..87c6853834a7d6
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.client/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.client-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.client/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.client-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.client/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.client-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..1f34e9b8fc7f73
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.client/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.client-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.rs.client
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.extension.providers/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.extension.providers-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.extension.providers/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.extension.providers-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..8b995179604ebb
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.extension.providers/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.extension.providers-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.extension.providers/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.extension.providers-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.extension.providers/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.extension.providers-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..d3ef384f9776d6
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.extension.providers/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.extension.providers-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.rs.extension.providers
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.json.basic/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.json.basic-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.json.basic/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.json.basic-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..4bd290708b2ac9
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.json.basic/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.json.basic-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.json.basic/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.json.basic-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.json.basic/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.json.basic-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..fc88908d1a1afd
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.json.basic/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.json.basic-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.rs.json.basic
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..d53634115eb661
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..d5446ec34de30a
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose.jaxrs/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose.jaxrs-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.rs.security.jose.jaxrs
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..400ccd38c83c15
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..a926425692c73b
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.jose/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.jose-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.rs.security.jose
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.oauth2/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.oauth2-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.oauth2/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.oauth2-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..abe22e8b62ab2d
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.oauth2/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.oauth2-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.oauth2/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.oauth2-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.oauth2/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.oauth2-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..54aca05e0f8055
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.security.oauth2/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.security.oauth2-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.rs.security.oauth2
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.sse/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.sse-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.sse/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.sse-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..353b62ec66b4ab
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.sse/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.sse-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.sse/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.sse-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.sse/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.sse-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..20fed4553ee13c
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.rs.sse/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.rs.sse-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.rs.sse
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.security/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.security-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.security/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.security-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..6a03d9588e9968
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.security/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.security-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.security/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.security-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.security/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.security-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..e11b28b9e465a4
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.security/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.security-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.security
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.transports.http/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.transports.http-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.transports.http/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.transports.http-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..02a7adf824f90a
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.transports.http/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.transports.http-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.transports.http/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.transports.http-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.transports.http/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.transports.http-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..4e2e13cb8e9770
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.transports.http/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.transports.http-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.transports.http
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.addr/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.addr-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.addr/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.addr-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..1f371414107d4c
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.addr/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.addr-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.addr/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.addr-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.addr/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.addr-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..4486d0f7a1d879
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.addr/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.addr-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.ws.addr
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.policy/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.policy-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.policy/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.policy-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..1718f1894b40bd
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.policy/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.policy-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.policy/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.policy-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.policy/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.policy-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..970a33071003e6
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.ws.policy/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.ws.policy-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.ws.policy
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.wsdl/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.wsdl-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.rt.wsdl/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.wsdl-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..6828b8228b89dc
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.rt.wsdl/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.wsdl-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.rt.wsdl/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.wsdl-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.rt.wsdl/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.wsdl-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..63f19c5aa5b0ea
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.rt.wsdl/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.rt.wsdl-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.rt.wsdl
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.tools.common/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.common-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.tools.common/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.common-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..af63f07529f750
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.tools.common/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.common-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.tools.common/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.common-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.tools.common/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.common-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..d0dedfbba0c4b6
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.tools.common/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.common-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.tools.common
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.tools.validator/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.validator-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.cxf.tools.validator/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.validator-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..f844fcc8275549
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.cxf.tools.validator/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.validator-3.5.10.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.cxf.tools.validator/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.validator-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.cxf.tools.validator/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.validator-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..a50cb90f7c8a41
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.cxf.tools.validator/3.5.10.JAKARTA_LIFERAY-PATCHED-1/org.apache.cxf.tools.validator-3.5.10.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.cxf.tools.validator
+ 3.5.10.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.apache.felix.configurator/1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.felix.configurator-1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.apache.felix.configurator/1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.felix.configurator-1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..659838951dfca4
Binary files /dev/null and b/.m2-tmp/com/liferay/org.apache.felix.configurator/1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.felix.configurator-1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.apache.felix.configurator/1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.felix.configurator-1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.apache.felix.configurator/1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.felix.configurator-1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..db88379dff1225
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.apache.felix.configurator/1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.apache.felix.configurator-1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.apache.felix.configurator
+ 1.0.18.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.eclipse.equinox.http.servlet/1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1/org.eclipse.equinox.http.servlet-1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.eclipse.equinox.http.servlet/1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1/org.eclipse.equinox.http.servlet-1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..83c928661e2037
Binary files /dev/null and b/.m2-tmp/com/liferay/org.eclipse.equinox.http.servlet/1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1/org.eclipse.equinox.http.servlet-1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.eclipse.equinox.http.servlet/1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1/org.eclipse.equinox.http.servlet-1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.eclipse.equinox.http.servlet/1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1/org.eclipse.equinox.http.servlet-1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..a246017196cfdc
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.eclipse.equinox.http.servlet/1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1/org.eclipse.equinox.http.servlet-1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.eclipse.equinox.http.servlet
+ 1.2.2.v20211118-0920.LIFERAY-PATCHED-4.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.hibernate.core/5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.core-5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.hibernate.core/5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.core-5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..fb5832896720db
Binary files /dev/null and b/.m2-tmp/com/liferay/org.hibernate.core/5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.core-5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.hibernate.core/5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.core-5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.hibernate.core/5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.core-5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..a0a592a3377178
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.hibernate.core/5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.core-5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.hibernate.core
+ 5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.hibernate.validator/6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.validator-6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.hibernate.validator/6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.validator-6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..e7ce0f8bf7a736
Binary files /dev/null and b/.m2-tmp/com/liferay/org.hibernate.validator/6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.validator-6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.hibernate.validator/6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.validator-6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.hibernate.validator/6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.validator-6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..6f06c8a4281b84
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.hibernate.validator/6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1/org.hibernate.validator-6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.hibernate.validator
+ 6.2.5.Final.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.opensaml.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.opensaml.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..4a88bd81c09e1c
Binary files /dev/null and b/.m2-tmp/com/liferay/org.opensaml.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.opensaml.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.opensaml.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..4d79180f3ab065
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.opensaml.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.opensaml.impl
+ 3.3.0.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.opensaml.messaging.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.opensaml.messaging.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..8a61b6650a1b83
Binary files /dev/null and b/.m2-tmp/com/liferay/org.opensaml.messaging.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.opensaml.messaging.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.opensaml.messaging.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..a20944056e02b6
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.opensaml.messaging.impl/3.3.0.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging.impl-3.3.0.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.opensaml.messaging.impl
+ 3.3.0.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.opensaml.messaging/3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging-3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.opensaml.messaging/3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging-3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..b5b387655f61cb
Binary files /dev/null and b/.m2-tmp/com/liferay/org.opensaml.messaging/3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging-3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.opensaml.messaging/3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging-3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.opensaml.messaging/3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging-3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..5170c84f068776
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.opensaml.messaging/3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.opensaml.messaging-3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.opensaml.messaging
+ 3.3.0.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.osgi.service.http.whiteboard/1.1.1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http.whiteboard-1.1.1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.osgi.service.http.whiteboard/1.1.1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http.whiteboard-1.1.1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..9e28a408d22736
Binary files /dev/null and b/.m2-tmp/com/liferay/org.osgi.service.http.whiteboard/1.1.1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http.whiteboard-1.1.1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.osgi.service.http.whiteboard/1.1.1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http.whiteboard-1.1.1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.osgi.service.http.whiteboard/1.1.1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http.whiteboard-1.1.1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..7a4fe6de6a072f
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.osgi.service.http.whiteboard/1.1.1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http.whiteboard-1.1.1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.osgi.service.http.whiteboard
+ 1.1.1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.osgi.service.http/1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http-1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.osgi.service.http/1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http-1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..e66ce9f43ad2d1
Binary files /dev/null and b/.m2-tmp/com/liferay/org.osgi.service.http/1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http-1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.osgi.service.http/1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http-1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.osgi.service.http/1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http-1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..961f7875260847
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.osgi.service.http/1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.osgi.service.http-1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.osgi.service.http
+ 1.2.2.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.springframework.orm/5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.springframework.orm-5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.springframework.orm/5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.springframework.orm-5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..d9ae4d059dbe3e
Binary files /dev/null and b/.m2-tmp/com/liferay/org.springframework.orm/5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.springframework.orm-5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.springframework.orm/5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.springframework.orm-5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.springframework.orm/5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.springframework.orm-5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..d837d7d6130954
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.springframework.orm/5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1/org.springframework.orm-5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.springframework.orm
+ 5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.springframework.test/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.test-5.3.39.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.springframework.test/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.test-5.3.39.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..93a7230a76ffd8
Binary files /dev/null and b/.m2-tmp/com/liferay/org.springframework.test/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.test-5.3.39.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.springframework.test/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.test-5.3.39.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.springframework.test/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.test-5.3.39.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..85a7bddea990a1
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.springframework.test/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.test-5.3.39.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.springframework.test
+ 5.3.39.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/.m2-tmp/com/liferay/org.springframework.web/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.web-5.3.39.JAKARTA_LIFERAY-PATCHED-1.jar b/.m2-tmp/com/liferay/org.springframework.web/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.web-5.3.39.JAKARTA_LIFERAY-PATCHED-1.jar
new file mode 100644
index 00000000000000..5ff6e88cb358cf
Binary files /dev/null and b/.m2-tmp/com/liferay/org.springframework.web/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.web-5.3.39.JAKARTA_LIFERAY-PATCHED-1.jar differ
diff --git a/.m2-tmp/com/liferay/org.springframework.web/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.web-5.3.39.JAKARTA_LIFERAY-PATCHED-1.pom b/.m2-tmp/com/liferay/org.springframework.web/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.web-5.3.39.JAKARTA_LIFERAY-PATCHED-1.pom
new file mode 100644
index 00000000000000..4f469381983922
--- /dev/null
+++ b/.m2-tmp/com/liferay/org.springframework.web/5.3.39.JAKARTA_LIFERAY-PATCHED-1/org.springframework.web-5.3.39.JAKARTA_LIFERAY-PATCHED-1.pom
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+ 4.0.0
+ com.liferay
+ org.springframework.web
+ 5.3.39.JAKARTA_LIFERAY-PATCHED-1
+
+
+ LGPL 2.1
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+
+
+
+
+ Brian Wing Shun Chan
+ Liferay, Inc.
+ http://www.liferay.com
+
+
+
+ scm:git:git@github.com:liferay/liferay-portal.git
+ scm:git:git@github.com:liferay/liferay-portal.git
+ http://github.com/liferay/liferay-portal
+
+
diff --git a/app.server.properties b/app.server.properties
index 4d7ee21872a575..4a8a04da08f189 100644
--- a/app.server.properties
+++ b/app.server.properties
@@ -32,8 +32,8 @@
## JBoss
##
- app.server.jboss.version=7.3.0
- app.server.jboss.supported.versions=7.3.0,7.4.0
+ app.server.jboss.version=8.0.0
+ app.server.jboss.supported.versions=8.0.0
app.server.jboss.dir=${app.server.parent.dir}/jboss-eap-${app.server.jboss.version}
app.server.jboss.bin.dir=${app.server.jboss.dir}/bin
app.server.jboss.classes.global.dir=${app.server.jboss.dir}/modules/com/liferay/portal/main
@@ -57,7 +57,7 @@
## Tomcat
##
- app.server.tomcat.version=9.0.98
+ app.server.tomcat.version=10.1.34
app.server.tomcat.dir=${app.server.parent.dir}/tomcat-${app.server.tomcat.version}
app.server.tomcat.bin.dir=${app.server.tomcat.dir}/bin
app.server.tomcat.classes.global.dir=${app.server.tomcat.dir}/lib
@@ -76,7 +76,7 @@
app.server.tomcat.temp.dir=${app.server.tomcat.dir}/temp
app.server.tomcat.work.dir=${app.server.tomcat.dir}/work
app.server.tomcat.zip.name=apache-tomcat-${app.server.tomcat.version}.zip
- app.server.tomcat.zip.url=http://archive.apache.org/dist/tomcat/tomcat-9/v${app.server.tomcat.version}/bin/${app.server.tomcat.zip.name}
+ app.server.tomcat.zip.url=http://archive.apache.org/dist/tomcat/tomcat-10/v${app.server.tomcat.version}/bin/${app.server.tomcat.zip.name}
##
## WebLogic
@@ -131,8 +131,8 @@
## WildFly
##
- app.server.wildfly.version=18.0.0
- app.server.wildfly.supported.versions=18.0.0,23.0.0,26.1.0
+ app.server.wildfly.version=30.0.0
+ app.server.wildfly.supported.versions=30.0.0
app.server.wildfly.dir=${app.server.parent.dir}/wildfly-${app.server.wildfly.version}
app.server.wildfly.bin.dir=${app.server.wildfly.dir}/bin
app.server.wildfly.classes.global.dir=${app.server.wildfly.dir}/modules/com/liferay/portal/main
@@ -150,7 +150,7 @@
app.server.wildfly.temp.dir=${app.server.wildfly.instance.dir}/tmp
app.server.wildfly.work.dir=${app.server.wildfly.instance.dir}/tmp/work
app.server.wildfly.zip.name=wildfly-${app.server.wildfly.version}.Final.zip
- app.server.wildfly.zip.url=https://download.jboss.org/wildfly/${app.server.wildfly.version}.Final/${app.server.wildfly.zip.name}
+ app.server.wildfly.zip.url=https://github.com/wildfly/wildfly/releases/download/${app.server.wildfly.version}.Final/${app.server.wildfly.zip.name}
##
## Clean
diff --git a/build-test-batch.xml b/build-test-batch.xml
index 719cd8480405d5..d970e932519cfc 100644
--- a/build-test-batch.xml
+++ b/build-test-batch.xml
@@ -4379,23 +4379,23 @@ information. Make sure to commit in all format-javadoc results.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -5467,33 +5467,33 @@ information. Make sure to commit in all format-javadoc results.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6029,27 +6029,27 @@ information. Make sure to commit in all format-javadoc results.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6197,21 +6197,21 @@ information. Make sure to commit in all format-javadoc results.
-
+
-
+
-
+
-
+
-
+
-
+
@@ -6510,75 +6510,75 @@ information. Make sure to commit in all format-javadoc results.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/build-test.xml b/build-test.xml
index 1f34bfc25b5b16..e0a58b21a8c7b8 100644
--- a/build-test.xml
+++ b/build-test.xml
@@ -6521,7 +6521,7 @@ ${custom.upgrade.properties}
-
+
@@ -6954,7 +6954,7 @@ log.sanitizer.enabled=false
-
+
@@ -12649,7 +12649,7 @@ captcha.enforce.disabled=true
diff --git a/build.properties b/build.properties
index 07b3ae8eed6c5d..ccc466732a71d0 100644
--- a/build.properties
+++ b/build.properties
@@ -456,7 +456,7 @@
org.gradle.console=plain
org.gradle.daemon=true
org.gradle.internal.launcher.welcomeMessageEnabled=false
- org.gradle.jvmargs=-Xms8g -Xmx8g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14
+ org.gradle.jvmargs=-Xms8g -Xmx8g -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=512m -XX:MaxNewSize=2g -XX:MetaspaceSize=512m -XX:NewSize=2g -XX:SurvivorRatio=14 -XX:TargetSurvivorRatio=14 -Djdk.util.zip.disableZip64ExtraFieldValidation=true
org.gradle.logging.level=lifecycle
org.gradle.warning.mode=none
diff --git a/build.xml b/build.xml
index d2bcc2fc23ffc9..406c1b91db224f 100644
--- a/build.xml
+++ b/build.xml
@@ -1115,6 +1115,32 @@ This target has been renamed to "snapshot-bundle". Please call "snapshot-bundle"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/commit-helper-rest.sh b/commit-helper-rest.sh
new file mode 100755
index 00000000000000..40ad37374c169e
--- /dev/null
+++ b/commit-helper-rest.sh
@@ -0,0 +1,5 @@
+git add *bnd.bnd
+git add *packageinfo
+git add *.java
+git add *.yaml
+git commit -m "gw buildREST"
\ No newline at end of file
diff --git a/commit-helper-semv.sh b/commit-helper-semv.sh
new file mode 100755
index 00000000000000..58ec5f3e068994
--- /dev/null
+++ b/commit-helper-semv.sh
@@ -0,0 +1,3 @@
+git add *bnd.bnd
+git add *packageinfo
+git commit -m "Semantic versioning"
\ No newline at end of file
diff --git a/commit-helper-trans.sh b/commit-helper-trans.sh
new file mode 100755
index 00000000000000..85286102290482
--- /dev/null
+++ b/commit-helper-trans.sh
@@ -0,0 +1,44 @@
+git add *.js
+git commit -m "Full generation js"
+
+git add *.jsp
+git add *.jspf
+git commit -m "Full generation jsp"
+
+git add *.java
+git commit -m "Full generation java"
+
+git add *.ftl
+git commit -m "Full generation ftl"
+
+git add *Language*.properties
+git commit -m "Full generation language"
+
+git add *build.gradle
+git commit -m "Full generation build.gradle"
+
+git add *bnd.bnd
+git commit -m "Full generation bnd.bnd"
+
+git add *.testcase
+git add *.macro
+git commit -m "Full generation testcase/macro"
+
+git add "*.html"
+git commit -m "Full generation html"
+
+git add "*.tld"
+git commit -m "Full generation tld"
+
+git add "*.xml"
+git commit -m "Full generation xml"
+
+git add lib/development/dependencies.properties
+git add lib/portal/dependencies.properties
+git commit -m "Full generation properties"
+
+git add modules/*/services/*
+git commit -m "Full generation SPI"
+
+git add .m2-tmp/*
+git commit -m "Full generation fake gradle cache"
\ No newline at end of file
diff --git a/lib/.gitignore b/lib/.gitignore
index ed469d961a19fb..de7a7c2f3e1128 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -105,6 +105,7 @@
/portal/istack-commons-runtime.jar
/portal/jabsorb.jar
/portal/jaxb-api.jar
+/portal/jaxb-core.jar
/portal/jaxb-runtime.jar
/portal/jaxen.jar
/portal/jaxws-api.jar
diff --git a/lib/development/dependencies.properties b/lib/development/dependencies.properties
index 0f26d5a39e4911..ec3be56d4eb7ff 100644
--- a/lib/development/dependencies.properties
+++ b/lib/development/dependencies.properties
@@ -1,4 +1,4 @@
-activation=javax.activation:activation:1.1.1
+activation=jakarta.activation:jakarta.activation-api:2.1.3
alloy-taglib=com.liferay.alloy-taglibs:alloy-taglib:1.1.14
ant-apache-bsf=org.apache.ant:ant-apache-bsf:1.10.9
ant-compress=org.apache.ant:ant-compress:1.5
@@ -10,8 +10,8 @@ aspectj-weaver=org.aspectj:aspectjweaver:1.9.22.1
bnd-repository=biz.aQute.bnd:biz.aQute.repository:6.4.0
byte-buddy-agent=net.bytebuddy:byte-buddy-agent:1.15.11
byte-buddy=net.bytebuddy:byte-buddy:1.15.11
-catalina-ha=org.apache.tomcat:tomcat-catalina-ha:9.0.98
-catalina=org.apache.tomcat:tomcat-catalina:9.0.98
+catalina-ha=org.apache.tomcat:tomcat-catalina-ha:10.1.34
+catalina=org.apache.tomcat:tomcat-catalina:10.1.34
com.liferay.ant.get.file.set=com.liferay:com.liferay.ant.get.file.set:1.0.0
com.liferay.ant.manifest.helper=com.liferay:com.liferay.ant.manifest.helper:1.0.3
com.liferay.ant.secure.property=com.liferay:com.liferay.ant.secure.property:1.0.0
@@ -42,11 +42,11 @@ jhighlight=com.uwyn:jhighlight:1.0
jndi=com.liferay:javax.naming.jndi:1.2.1
jsch=com.jcraft:jsch:0.1.55
jsonassert=org.skyscreamer:jsonassert:1.2.3
-jstl-api=javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2
-jstl-impl=org.glassfish.web:javax.servlet.jsp.jstl:1.2.3
+jstl-api=jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.2
+jstl-impl=org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1
junit=junit:junit:4.13.1
log4j-1.2-api=org.apache.logging.log4j:log4j-1.2-api:2.17.1
-mail=com.sun.mail:jakarta.mail:1.6.6
+mail=jakarta.mail:jakarta.mail-api:2.1.3
mariadb=org.mariadb.jdbc:mariadb-java-client:3.2.0
maven-ant-tasks=org.apache.maven:maven-ant-tasks:2.1.3
mockito-core=org.mockito:mockito-core:4.5.1
@@ -59,8 +59,8 @@ osgi-service-cm=org.osgi:org.osgi.service.cm:1.6.0
osgi-service-component=org.osgi:org.osgi.service.component:1.4.0
osgi-service-log=org.osgi:org.osgi.service.log:1.4.0
p6spy=p6spy:p6spy:1.3
-portlet=javax.portlet:portlet-api:3.0.1
-portletmvc4spring-test=com.liferay.portletmvc4spring:com.liferay.portletmvc4spring.test:5.2.1
+portlet=com.liferay.jakarta.portlet:com.liferay.jakarta.portlet-api:4.0.0
+portletmvc4spring-test=com.liferay:com.liferay.portletmvc4spring.test:5.2.1.JAKARTA_LIFERAY-PATCHED-1
postgresql=org.postgresql:postgresql:42.4.4
qdox=com.thoughtworks.qdox:qdox:1.12.1
reflections=org.reflections:reflections:0.9.12
@@ -72,20 +72,20 @@ smtp=com.sun.mail:smtp:1.5.4
snakeyaml=org.yaml:snakeyaml:2.3
spring-instrument-tomcat=org.springframework:spring-instrument-tomcat:4.3.23.RELEASE
spring-instrument=org.springframework:spring-instrument:5.3.39
-spring-test=org.springframework:spring-test:5.3.39
+spring-test=com.liferay:org.springframework.test:5.3.39.JAKARTA_LIFERAY-PATCHED-1
tlddoc=taglibrarydoc:tlddoc:1.3
-tomcat-annotations-api=org.apache.tomcat:tomcat-annotations-api:9.0.98
-tomcat-api=org.apache.tomcat:tomcat-api:9.0.98
-tomcat-coyote=org.apache.tomcat:tomcat-coyote:9.0.98
-tomcat-el-api=org.apache.tomcat:tomcat-el-api:9.0.98
-tomcat-jasper-el=org.apache.tomcat:tomcat-jasper-el:9.0.98
-tomcat-jasper=org.apache.tomcat:tomcat-jasper:9.0.98
-tomcat-jsp-api=org.apache.tomcat:tomcat-jsp-api:9.0.98
-tomcat-juli=org.apache.tomcat:tomcat-juli:9.0.98
-tomcat-servlet-api=org.apache.tomcat:tomcat-servlet-api:9.0.98
-tomcat-tribes=org.apache.tomcat:tomcat-tribes:9.0.98
-tomcat-util-scan=org.apache.tomcat:tomcat-util-scan:9.0.98
-tomcat-util=org.apache.tomcat:tomcat-util:9.0.98
-tomcat-websocket-api=org.apache.tomcat:tomcat-websocket-api:9.0.98
+tomcat-annotations-api=org.apache.tomcat:tomcat-annotations-api:10.1.34
+tomcat-api=org.apache.tomcat:tomcat-api:10.1.34
+tomcat-coyote=org.apache.tomcat:tomcat-coyote:10.1.34
+tomcat-el-api=org.apache.tomcat:tomcat-el-api:10.1.34
+tomcat-jasper-el=org.apache.tomcat:tomcat-jasper-el:10.1.34
+tomcat-jasper=org.apache.tomcat:tomcat-jasper:10.1.34
+tomcat-jsp-api=org.apache.tomcat:tomcat-jsp-api:10.1.34
+tomcat-juli=org.apache.tomcat:tomcat-juli:10.1.34
+tomcat-servlet-api=org.apache.tomcat:tomcat-servlet-api:10.1.34
+tomcat-tribes=org.apache.tomcat:tomcat-tribes:10.1.34
+tomcat-util-scan=org.apache.tomcat:tomcat-util-scan:10.1.34
+tomcat-util=org.apache.tomcat:tomcat-util:10.1.34
+tomcat-websocket-api=org.apache.tomcat:tomcat-websocket-api:10.1.34
velocity-tools=velocity-tools:velocity-tools:1.4
velocity=com.liferay:org.apache.velocity:1.6.4.LIFERAY-PATCHED-3
\ No newline at end of file
diff --git a/lib/portal/dependencies.properties b/lib/portal/dependencies.properties
index 35f48017c44e37..222f79f67c09eb 100644
--- a/lib/portal/dependencies.properties
+++ b/lib/portal/dependencies.properties
@@ -2,34 +2,35 @@ commons-configuration=com.liferay:org.apache.commons.configuration:1.10.LIFERAY-
commons-lang=commons-lang:commons-lang:2.6
commons-logging=com.liferay:org.apache.commons.logging:1.2.LIFERAY-PATCHED-2
dom4j=org.dom4j:dom4j:2.1.3
-hibernate-core=com.liferay:org.hibernate.core:5.6.7.LIFERAY-PATCHED-2
+hibernate-core=com.liferay:org.hibernate.core:5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1
hikaricp=com.zaxxer:HikariCP:4.0.3
istack-commons-runtime=com.sun.istack:istack-commons-runtime:3.0.7
jabsorb=com.liferay:org.jabsorb:1.3.2.LIFERAY-PATCHED-2
-jaxb-api=javax.xml.bind:jaxb-api:2.3.0
-jaxb-runtime=com.liferay:org.glassfish.jaxb.runtime:2.3.1.LIFERAY-PATCHED-2
+jaxb-api=jakarta.xml.bind:jakarta.xml.bind-api:4.0.2
+jaxb-core=org.glassfish.jaxb:jaxb-core:4.0.5
+jaxb-runtime=org.glassfish.jaxb:jaxb-runtime:4.0.5
jaxen=jaxen:jaxen:1.1.6
-jaxws-api=javax.xml.ws:jaxws-api:2.3.1
+jaxws-api=jakarta.xml.ws:jakarta.xml.ws-api:3.0.1
jcl-over-slf4j=org.slf4j:jcl-over-slf4j:1.7.2
jodd-json=org.jodd:jodd-json:6.0.3
jodd-util=com.liferay:jodd.util:6.0.1.LIFERAY-PATCHED-2
json-java=org.json:json:20231013
-jws-api=javax.jws:javax.jws-api:1.1
+jws-api=jakarta.jws:jakarta.jws-api:3.0.0
log4j-api=com.liferay:org.apache.logging.log4j:2.17.1.LIFERAY-PATCHED-1
log4j-core=com.liferay:org.apache.logging.log4j.core:2.17.1.LIFERAY-PATCHED-1
-persistence=org.eclipse.persistence:javax.persistence:2.2.1
+persistence=jakarta.persistence:jakarta.persistence-api:3.1.0
slf4j-api=org.slf4j:slf4j-api:1.7.26
-soap-api=javax.xml.soap:javax.xml.soap-api:1.4.0
+soap-api=jakarta.xml.soap:jakarta.xml.soap-api:3.0.2
spring-aop=org.springframework:spring-aop:5.3.39
spring-beans=com.liferay:org.springframework.beans:5.3.39.LIFERAY-PATCHED-1
spring-context=com.liferay:org.springframework.context:5.3.39.LIFERAY-PATCHED-1
spring-core=org.springframework:spring-core:5.3.39
spring-expression=org.springframework:spring-expression:5.3.39
spring-jdbc=org.springframework:spring-jdbc:5.3.39
-spring-orm=com.liferay:org.springframework.orm:5.3.39.LIFERAY-PATCHED-1
+spring-orm=com.liferay:org.springframework.orm:5.3.39.LIFERAY-PATCHED-1.JAKARTA_LIFERAY-PATCHED-1
spring-tx=com.liferay:org.springframework.tx:5.3.39.LIFERAY-PATCHED-1
-spring-web=org.springframework:spring-web:5.3.39
+spring-web=com.liferay:org.springframework.web:5.3.39.JAKARTA_LIFERAY-PATCHED-1
stax-ex=org.jvnet.staxex:stax-ex:1.2
-transaction=javax.transaction:javax.transaction-api:1.3
+transaction=jakarta.transaction:jakarta.transaction-api:2.0.1
xercesImpl=xerces:xercesImpl:2.12.2
xml-apis=xml-apis:xml-apis:1.4.01
\ No newline at end of file
diff --git a/modules/apps/accessibility/accessibility-menu-web/build.gradle b/modules/apps/accessibility/accessibility-menu-web/build.gradle
index 7137978a8d85e6..1de48b9abf7613 100644
--- a/modules/apps/accessibility/accessibility-menu-web/build.gradle
+++ b/modules/apps/accessibility/accessibility-menu-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:frontend-js:frontend-js-loader-modules-extender-api")
compileOnly project(":apps:frontend-taglib:frontend-taglib-react")
diff --git a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/display/context/AccessibilityMenuDisplayContext.java b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/display/context/AccessibilityMenuDisplayContext.java
index 94912aa3bbca41..e8f42e2b3216fa 100644
--- a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/display/context/AccessibilityMenuDisplayContext.java
+++ b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/display/context/AccessibilityMenuDisplayContext.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.json.JSONArray;
import com.liferay.portal.kernel.json.JSONUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Evan Thibodeau
diff --git a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/portlet/AccessibilityMenuPortlet.java b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/portlet/AccessibilityMenuPortlet.java
index 6514b0ce7942f6..372fdd8dfd3d6d 100644
--- a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/portlet/AccessibilityMenuPortlet.java
+++ b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/portlet/AccessibilityMenuPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.accessibility.menu.web.internal.constants.AccessibilityMenuPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -23,14 +23,14 @@
"com.liferay.portlet.private-request-attributes=false",
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Accessibility Menu",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AccessibilityMenuPortletKeys.ACCESSIBILITY_MENU,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator,guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Accessibility Menu",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AccessibilityMenuPortletKeys.ACCESSIBILITY_MENU,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator,guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/product/navigation/personal/menu/AccessibilityMenuPersonalMenuEntry.java b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/product/navigation/personal/menu/AccessibilityMenuPersonalMenuEntry.java
index 87e4e831a8fad2..2170f0f231ba89 100644
--- a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/product/navigation/personal/menu/AccessibilityMenuPersonalMenuEntry.java
+++ b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/product/navigation/personal/menu/AccessibilityMenuPersonalMenuEntry.java
@@ -15,9 +15,9 @@
import com.liferay.product.navigation.personal.menu.BasePersonalMenuEntry;
import com.liferay.product.navigation.personal.menu.PersonalMenuEntry;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/servlet/taglib/AccessibilityMenuBodyTopJSPDynamicInclude.java b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/servlet/taglib/AccessibilityMenuBodyTopJSPDynamicInclude.java
index d986b17b60253d..3a179df81455e7 100644
--- a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/servlet/taglib/AccessibilityMenuBodyTopJSPDynamicInclude.java
+++ b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/servlet/taglib/AccessibilityMenuBodyTopJSPDynamicInclude.java
@@ -14,12 +14,12 @@
import com.liferay.taglib.portletext.RuntimeTag;
import com.liferay.taglib.servlet.PageContextFactoryUtil;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/servlet/taglib/AccessibilityMenuTopHeadDynamicInclude.java b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/servlet/taglib/AccessibilityMenuTopHeadDynamicInclude.java
index 508bb2163cf7cb..480caa24ada879 100644
--- a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/servlet/taglib/AccessibilityMenuTopHeadDynamicInclude.java
+++ b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/servlet/taglib/AccessibilityMenuTopHeadDynamicInclude.java
@@ -14,14 +14,14 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/util/AccessibilitySettingsUtil.java b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/util/AccessibilitySettingsUtil.java
index 2cd54f96a998c0..55925ffdb99c6c 100644
--- a/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/util/AccessibilitySettingsUtil.java
+++ b/modules/apps/accessibility/accessibility-menu-web/src/main/java/com/liferay/accessibility/menu/web/internal/util/AccessibilitySettingsUtil.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Evan Thibodeau
diff --git a/modules/apps/accessibility/accessibility-menu-web/src/test/java/com/liferay/accessibility/menu/web/internal/util/AccessibilitySettingsUtilTest.java b/modules/apps/accessibility/accessibility-menu-web/src/test/java/com/liferay/accessibility/menu/web/internal/util/AccessibilitySettingsUtilTest.java
index ace8b39c8df2b3..294d8a5162f852 100644
--- a/modules/apps/accessibility/accessibility-menu-web/src/test/java/com/liferay/accessibility/menu/web/internal/util/AccessibilitySettingsUtilTest.java
+++ b/modules/apps/accessibility/accessibility-menu-web/src/test/java/com/liferay/accessibility/menu/web/internal/util/AccessibilitySettingsUtilTest.java
@@ -10,7 +10,7 @@
import com.liferay.portal.language.LanguageImpl;
import com.liferay.portal.test.rule.LiferayUnitTestRule;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/account/account-admin-web/build.gradle b/modules/apps/account/account-admin-web/build.gradle
index 365691af5ac8a8..4e7cc92eb02b5a 100644
--- a/modules/apps/account/account-admin-web/build.gradle
+++ b/modules/apps/account/account-admin-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.jaxrs", version: "1.0.0"
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountEntriesAdminPanelApp.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountEntriesAdminPanelApp.java
index 581e90d7554c38..e2452cd4fef211 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountEntriesAdminPanelApp.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountEntriesAdminPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountGroupsAdminPanelApp.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountGroupsAdminPanelApp.java
index cd8f60467738e2..c07174450fdc9a 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountGroupsAdminPanelApp.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountGroupsAdminPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountUsersAdminPanelApp.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountUsersAdminPanelApp.java
index 9df71f39a3ee11..cdc177eead24d1 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountUsersAdminPanelApp.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/application/list/AccountUsersAdminPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/custom/attributes/AccountEntryCustomAttributesDisplay.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/custom/attributes/AccountEntryCustomAttributesDisplay.java
index c704d2c64348c5..5be3526e081483 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/custom/attributes/AccountEntryCustomAttributesDisplay.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/custom/attributes/AccountEntryCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Drew Brokke
*/
@Component(
- property = "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ property = "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
service = CustomAttributesDisplay.class
)
public class AccountEntryCustomAttributesDisplay
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/custom/attributes/AccountGroupCustomAttributesDisplay.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/custom/attributes/AccountGroupCustomAttributesDisplay.java
index 628b17b9ea0233..f3936643d6da6b 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/custom/attributes/AccountGroupCustomAttributesDisplay.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/custom/attributes/AccountGroupCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Drew Brokke
*/
@Component(
- property = "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
+ property = "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
service = CustomAttributesDisplay.class
)
public class AccountGroupCustomAttributesDisplay
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountGroupAccountEntryRowChecker.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountGroupAccountEntryRowChecker.java
index 5c8ec86866a3a5..c05fb4094e9756 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountGroupAccountEntryRowChecker.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountGroupAccountEntryRowChecker.java
@@ -13,7 +13,7 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountRoleRowChecker.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountRoleRowChecker.java
index 7be3345b198efe..c4c8db5dd9dc6f 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountRoleRowChecker.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountRoleRowChecker.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.model.Role;
import com.liferay.portal.kernel.model.role.RoleConstants;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountUserRowChecker.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountUserRowChecker.java
index 19862106e73d84..8f5fc252a9fc47 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountUserRowChecker.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/AccountUserRowChecker.java
@@ -13,7 +13,7 @@
import com.liferay.account.validator.AccountEntryEmailAddressValidator;
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Erick Monteiro
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountOrganizationRowChecker.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountOrganizationRowChecker.java
index b7c5f6e24f5f32..ba2a6edd7e1369 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountOrganizationRowChecker.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountOrganizationRowChecker.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.model.Organization;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountRoleUserRowChecker.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountRoleUserRowChecker.java
index ef48b0e3043be2..2f7315fec4be8a 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountRoleUserRowChecker.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountRoleUserRowChecker.java
@@ -13,7 +13,7 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.service.UserGroupRoleLocalServiceUtil;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountUserAccountRoleRowChecker.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountUserAccountRoleRowChecker.java
index 3ce003c774c502..d7bf87bf98154c 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountUserAccountRoleRowChecker.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountUserAccountRoleRowChecker.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.service.UserGroupRoleLocalServiceUtil;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountUserRowChecker.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountUserRowChecker.java
index 7140b4d8516193..61dee262f55af0 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountUserRowChecker.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/dao/search/SelectAccountUserRowChecker.java
@@ -9,7 +9,7 @@
import com.liferay.account.service.AccountEntryUserRelLocalServiceUtil;
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountEntryDisplayFactoryUtil.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountEntryDisplayFactoryUtil.java
index 302d967897b5ee..2d10550c9f82a7 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountEntryDisplayFactoryUtil.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountEntryDisplayFactoryUtil.java
@@ -25,15 +25,15 @@
import com.liferay.portal.kernel.webserver.WebServerServletTokenUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Drew Brokke
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountUserDisplay.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountUserDisplay.java
index 450b4316374ed9..e0cc4ed9bc9b95 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountUserDisplay.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/AccountUserDisplay.java
@@ -28,13 +28,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Pei-Jung Lan
*/
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/AccountEntryAccountGroupManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/AccountEntryAccountGroupManagementToolbarDisplayContext.java
index d60b29646be5fb..ad61dea02681df 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/AccountEntryAccountGroupManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/AccountEntryAccountGroupManagementToolbarDisplayContext.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/AccountUsersAdminManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/AccountUsersAdminManagementToolbarDisplayContext.java
index 274a19fdbb72d5..d3e8c61c72f6b2 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/AccountUsersAdminManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/AccountUsersAdminManagementToolbarDisplayContext.java
@@ -39,14 +39,14 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Albert Lee
*/
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/EditContactInformationDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/EditContactInformationDisplayContext.java
index d2f6f0cff5d5ea..f0e3b811eb8d8e 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/EditContactInformationDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/EditContactInformationDisplayContext.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Danny Situ
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntriesManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntriesManagementToolbarDisplayContext.java
index 16bc6bef2f2cb9..7a3410d3d13c33 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntriesManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntriesManagementToolbarDisplayContext.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.portlet.LiferayPortletRequest;
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntryAddressManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntryAddressManagementToolbarDisplayContext.java
index 9239ad209c7d08..b94cafa0fac0df 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntryAddressManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntryAddressManagementToolbarDisplayContext.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Pei-Jung Lan
*/
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntryManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntryManagementToolbarDisplayContext.java
index 2a9827ed00a0fe..b1faaac119023a 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntryManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountEntryManagementToolbarDisplayContext.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountOrganizationsManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountOrganizationsManagementToolbarDisplayContext.java
index c051f33dea26eb..a2cc004bb556d3 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountOrganizationsManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountOrganizationsManagementToolbarDisplayContext.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountUsersManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountUsersManagementToolbarDisplayContext.java
index 700caf6d419fad..59bb4d769521a9 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountUsersManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/SelectAccountUsersManagementToolbarDisplayContext.java
@@ -27,13 +27,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PortalUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Pei-Jung Lan
*/
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountEntriesManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountEntriesManagementToolbarDisplayContext.java
index 9524e8daaea41c..a311ad2dcf7b34 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountEntriesManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountEntriesManagementToolbarDisplayContext.java
@@ -42,15 +42,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowThreadLocal;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.function.Supplier;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Pei-Jung Lan
*/
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountEntryAddressesManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountEntryAddressesManagementToolbarDisplayContext.java
index dcae7d01306ce2..8da2087086bdb0 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountEntryAddressesManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountEntryAddressesManagementToolbarDisplayContext.java
@@ -31,14 +31,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Pei-Jung Lan
*/
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountGroupAccountEntriesManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountGroupAccountEntriesManagementToolbarDisplayContext.java
index 7451bfd698cd5d..d02412bbc10748 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountGroupAccountEntriesManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountGroupAccountEntriesManagementToolbarDisplayContext.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountGroupsManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountGroupsManagementToolbarDisplayContext.java
index 8440638e0f05b9..374e9c7101bb5d 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountGroupsManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountGroupsManagementToolbarDisplayContext.java
@@ -29,12 +29,12 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountOrganizationsManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountOrganizationsManagementToolbarDisplayContext.java
index 1e5a009d648d81..49e62401f74721 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountOrganizationsManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountOrganizationsManagementToolbarDisplayContext.java
@@ -27,9 +27,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountRoleAssigneesManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountRoleAssigneesManagementToolbarDisplayContext.java
index e7bf7f199da95a..9c4a0cc80459f5 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountRoleAssigneesManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountRoleAssigneesManagementToolbarDisplayContext.java
@@ -28,11 +28,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountRolesManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountRolesManagementToolbarDisplayContext.java
index 1ad523e1bc67f8..a7bbd14a368faf 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountRolesManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountRolesManagementToolbarDisplayContext.java
@@ -29,12 +29,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountUserRolesManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountUserRolesManagementToolbarDisplayContext.java
index 3f66fb97fd0c02..b59fb17e4b6767 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountUserRolesManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountUserRolesManagementToolbarDisplayContext.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.portlet.LiferayPortletRequest;
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountUsersManagementToolbarDisplayContext.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountUsersManagementToolbarDisplayContext.java
index 6910e510949e0b..18342d71306b24 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountUsersManagementToolbarDisplayContext.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/display/context/ViewAccountUsersManagementToolbarDisplayContext.java
@@ -32,12 +32,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountAddressDetailsScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountAddressDetailsScreenNavigationEntry.java
index 8487b218425d97..5be4f095fd1f26 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountAddressDetailsScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountAddressDetailsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.model.Address;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountGroupAccountEntriesScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountGroupAccountEntriesScreenNavigationEntry.java
index 6b66a57b5a9a95..2a04a73b9171c5 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountGroupAccountEntriesScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountGroupAccountEntriesScreenNavigationEntry.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.security.permission.PermissionCheckerFactoryUtil;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountGroupDetailsScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountGroupDetailsScreenNavigationEntry.java
index 1666ee4bab68ce..4bfb0cf2de8660 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountGroupDetailsScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountGroupDetailsScreenNavigationEntry.java
@@ -16,10 +16,10 @@
import com.liferay.portal.kernel.security.permission.PermissionCheckerFactoryUtil;
import com.liferay.portal.kernel.service.permission.PortalPermissionUtil;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountRoleAssigneesScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountRoleAssigneesScreenNavigationEntry.java
index 9f977764a2a15b..6b31d448d6e5da 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountRoleAssigneesScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountRoleAssigneesScreenNavigationEntry.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.security.permission.PermissionCheckerFactoryUtil;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountRoleDetailsScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountRoleDetailsScreenNavigationEntry.java
index 74e1710ec3bcd8..e9e7d6ad9a93da 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountRoleDetailsScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountRoleDetailsScreenNavigationEntry.java
@@ -16,10 +16,10 @@
import com.liferay.portal.kernel.security.permission.PermissionCheckerFactoryUtil;
import com.liferay.portal.kernel.service.RoleLocalService;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountUserAccountEntriesScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountUserAccountEntriesScreenNavigationEntry.java
index d7f9dcc2fdf61f..95c4192748d687 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountUserAccountEntriesScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/AccountUserAccountEntriesScreenNavigationEntry.java
@@ -18,13 +18,13 @@
import com.liferay.portal.kernel.security.permission.PermissionCheckerFactoryUtil;
import com.liferay.portal.kernel.service.permission.UserPermissionUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountEntryScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountEntryScreenNavigationEntry.java
index 3e67e547cc222d..944b7063ca71b0 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountEntryScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountEntryScreenNavigationEntry.java
@@ -12,10 +12,10 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountRoleDefinePermissionsScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountRoleDefinePermissionsScreenNavigationEntry.java
index eab1c399dfcfe5..819cf41ef41a0c 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountRoleDefinePermissionsScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountRoleDefinePermissionsScreenNavigationEntry.java
@@ -26,17 +26,17 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Reference;
/**
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountUserScreenNavigationEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountUserScreenNavigationEntry.java
index 27a94ce4e6bafd..48e54ba36ebbb4 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountUserScreenNavigationEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/frontend/taglib/servlet/taglib/BaseAccountUserScreenNavigationEntry.java
@@ -20,15 +20,15 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Reference;
/**
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/helper/AccountRoleRequestHelper.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/helper/AccountRoleRequestHelper.java
index 471e2bd9bbda50..0ee32d8d0f48c8 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/helper/AccountRoleRequestHelper.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/helper/AccountRoleRequestHelper.java
@@ -16,9 +16,9 @@
import com.liferay.roles.admin.panel.category.role.type.mapper.PanelCategoryRoleTypeMapperRegistry;
import com.liferay.roles.admin.role.type.contributor.RoleTypeContributor;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/instance/lifecycle/AddDefaultAccountRolesPortletPermissionsPortalInstanceLifecycleListener.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/instance/lifecycle/AddDefaultAccountRolesPortletPermissionsPortalInstanceLifecycleListener.java
index 8a42a4d78dfdf6..4a6090bf62d213 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/instance/lifecycle/AddDefaultAccountRolesPortletPermissionsPortalInstanceLifecycleListener.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/instance/lifecycle/AddDefaultAccountRolesPortletPermissionsPortalInstanceLifecycleListener.java
@@ -94,7 +94,7 @@ private void _checkResourcePermissions(
}
@Reference(
- target = "(javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN + ")"
)
private Portlet _accountUsersAdminPortlet;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/jaxrs/application/AccountAdminApplication.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/jaxrs/application/AccountAdminApplication.java
index f77b5d42e65f2e..431c15df20189e 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/jaxrs/application/AccountAdminApplication.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/jaxrs/application/AccountAdminApplication.java
@@ -15,18 +15,18 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Collections;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import java.util.Collections;
+import java.util.Set;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/AddressContactInfoManager.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/AddressContactInfoManager.java
index 9150708523c1b3..54f4c8dbaca19a 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/AddressContactInfoManager.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/AddressContactInfoManager.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
-import javax.portlet.ActionRequest;
+import java.util.List;
/**
* @author Danny Situ
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/BaseContactInfoManager.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/BaseContactInfoManager.java
index 29518bc6851b69..63c9efa84eb765 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/BaseContactInfoManager.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/BaseContactInfoManager.java
@@ -5,9 +5,9 @@
package com.liferay.account.admin.web.internal.manager;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
-import javax.portlet.ActionRequest;
+import java.util.List;
/**
* @author Danny Situ
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/ContactInfoManager.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/ContactInfoManager.java
index 4543b38fc5b052..3bd913ade8d9a1 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/ContactInfoManager.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/ContactInfoManager.java
@@ -5,7 +5,7 @@
package com.liferay.account.admin.web.internal.manager;
-import javax.portlet.ActionRequest;
+import jakarta.portlet.ActionRequest;
/**
* @author Danny Situ
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/EmailAddressContactInfoManager.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/EmailAddressContactInfoManager.java
index e911bde84a9cc3..64a5b2472e636c 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/EmailAddressContactInfoManager.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/EmailAddressContactInfoManager.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
-import javax.portlet.ActionRequest;
+import java.util.List;
/**
* @author Danny Situ
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/PhoneContactInfoManager.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/PhoneContactInfoManager.java
index 56343695305af5..f073bcdb7fe4d4 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/PhoneContactInfoManager.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/PhoneContactInfoManager.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
-import javax.portlet.ActionRequest;
+import java.util.List;
/**
* @author Danny Situ
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/WebsiteContactInfoManager.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/WebsiteContactInfoManager.java
index b303b81d0211f0..f37963b08d7ed1 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/WebsiteContactInfoManager.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/manager/WebsiteContactInfoManager.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.service.WebsiteService;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
-import javax.portlet.ActionRequest;
+import java.util.List;
/**
* @author Danny Situ
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountEntriesAdminPortlet.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountEntriesAdminPortlet.java
index aa700c7ea32c3c..beb3029ddeb6fc 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountEntriesAdminPortlet.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountEntriesAdminPortlet.java
@@ -10,12 +10,12 @@
import com.liferay.petra.lang.SafeCloseable;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
@@ -30,14 +30,14 @@
"com.liferay.portlet.private-request-attributes=false",
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Accounts",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/account_entries_admin/view.jsp",
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Accounts",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/account_entries_admin/view.jsp",
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountEntriesManagementPortlet.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountEntriesManagementPortlet.java
index 3dfe7c18cda190..c618efb9782db1 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountEntriesManagementPortlet.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountEntriesManagementPortlet.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,14 +32,14 @@
"com.liferay.portlet.display-category=category.accounts",
"com.liferay.portlet.preferences-owned-by-group=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Account Management",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/account_entries_admin/view.jsp",
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Account Management",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/account_entries_admin/view.jsp",
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountGroupsAdminPortlet.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountGroupsAdminPortlet.java
index e18059dd5abfa6..a3dbe44e68ae66 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountGroupsAdminPortlet.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountGroupsAdminPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.account.constants.AccountPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -22,14 +22,14 @@
"com.liferay.portlet.private-request-attributes=false",
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Account Groups",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/account_groups_admin/view.jsp",
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Account Groups",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/account_groups_admin/view.jsp",
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountUserRegistrationPortlet.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountUserRegistrationPortlet.java
index 27042deb0b9f83..cd89ddb4d3fc10 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountUserRegistrationPortlet.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountUserRegistrationPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.account.constants.AccountPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -24,14 +24,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.single-page-application=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Account User Registration",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/account_user_registration/create_account_user.jsp",
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_REGISTRATION,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Account User Registration",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/account_user_registration/create_account_user.jsp",
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_REGISTRATION,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountUsersAdminPortlet.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountUsersAdminPortlet.java
index c9649a677d8c24..71cc081e0b6d5c 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountUsersAdminPortlet.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountUsersAdminPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.account.constants.AccountPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -22,14 +22,14 @@
"com.liferay.portlet.private-request-attributes=false",
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Account Users",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/account_users_admin/view.jsp",
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Account Users",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/account_users_admin/view.jsp",
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountsControlPanelEntry.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountsControlPanelEntry.java
index 241445046e4268..72477a188c9d76 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountsControlPanelEntry.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/AccountsControlPanelEntry.java
@@ -27,8 +27,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN
},
service = ControlPanelEntry.class
)
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AccountEntriesConfigurationAction.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AccountEntriesConfigurationAction.java
index f2477b60032333..b9d4f0861ef6e5 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AccountEntriesConfigurationAction.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AccountEntriesConfigurationAction.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.portlet.ConfigurationAction;
import com.liferay.portal.kernel.portlet.DefaultConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
@@ -17,7 +17,7 @@
* @author Pei-Jung Lan
*/
@Component(
- property = "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ property = "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
service = ConfigurationAction.class
)
public class AccountEntriesConfigurationAction
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AddAccountUserMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AddAccountUserMVCActionCommand.java
index be2da7ec98910a..26737c63a2bd5e 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AddAccountUserMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AddAccountUserMVCActionCommand.java
@@ -34,10 +34,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -47,9 +47,9 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
"mvc.command.name=/account_admin/add_account_user"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AddAccountUserMVCRenderCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AddAccountUserMVCRenderCommand.java
index 8c95c084502d81..1ffb127d619103 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AddAccountUserMVCRenderCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AddAccountUserMVCRenderCommand.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -23,9 +23,9 @@
@Component(
configurationPid = "com.liferay.users.admin.configuration.UserFileUploadsConfiguration",
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
"mvc.command.name=/account_admin/add_account_user"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountGroupAccountEntriesMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountGroupAccountEntriesMVCActionCommand.java
index 71b2e0bbb4e847..609d5713fb4a0b 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountGroupAccountEntriesMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountGroupAccountEntriesMVCActionCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
"mvc.command.name=/account_admin/assign_account_group_account_entries"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountOrganizationsMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountOrganizationsMVCActionCommand.java
index eb3840b703e9c8..4ea42fb7bc8d00 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountOrganizationsMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountOrganizationsMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,8 +22,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/assign_account_organizations"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountRoleUsersMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountRoleUsersMVCActionCommand.java
index 84723d6a1ae8b6..7944e514e7f46f 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountRoleUsersMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountRoleUsersMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,8 +22,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/assign_account_role_users"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountUsersMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountUsersMVCActionCommand.java
index 0730a14f0e5c50..78c6f70861f500 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountUsersMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/AssignAccountUsersMVCActionCommand.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.PrefsParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,8 +32,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/assign_account_users"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/CreateAccountUserMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/CreateAccountUserMVCActionCommand.java
index 3e4f639d5deecc..e55b18fe6529a9 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/CreateAccountUserMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/CreateAccountUserMVCActionCommand.java
@@ -37,10 +37,10 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.util.PropsValues;
-import java.time.Month;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.time.Month;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_REGISTRATION,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_REGISTRATION,
"mvc.command.name=/account_admin/create_account_user"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/CreateAccountUserMVCRenderCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/CreateAccountUserMVCRenderCommand.java
index d04ae90610b3ec..87c6f2ed6274e5 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/CreateAccountUserMVCRenderCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/CreateAccountUserMVCRenderCommand.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_REGISTRATION,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_REGISTRATION,
"mvc.command.name=/account_admin/create_account_user",
"portlet.add.default.resource.check.whitelist.mvc.action=true"
},
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountEntryAddressesMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountEntryAddressesMVCActionCommand.java
index db7616f975dc50..d2bc352a6909e5 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountEntryAddressesMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountEntryAddressesMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/delete_account_entry_addresses"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountEntryMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountEntryMVCActionCommand.java
index 6c1b054ef625d4..5387d077563506 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountEntryMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountEntryMVCActionCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,8 +23,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/delete_account_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountGroupsMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountGroupsMVCActionCommand.java
index a3aa1101313195..c65bc43f4bd722 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountGroupsMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountGroupsMVCActionCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
"mvc.command.name=/account_admin/delete_account_groups"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountRolesMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountRolesMVCActionCommand.java
index b2c857cfe8e4b2..5573c4f1605de9 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountRolesMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/DeleteAccountRolesMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,8 +22,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/delete_account_roles"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCActionCommand.java
index afe9d032e1cd03..67f6357a539b6a 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCActionCommand.java
@@ -24,10 +24,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,8 +39,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_entry_address"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCRenderCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCRenderCommand.java
index 400333f414cec6..7a050119cb98c3 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCRenderCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCRenderCommand.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -23,8 +23,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_entry_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryContactMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryContactMVCActionCommand.java
index 11e6cdb65f4718..0919df838908f2 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryContactMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryContactMVCActionCommand.java
@@ -21,8 +21,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,8 +34,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_entry_contact"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryContactMVCRenderCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryContactMVCRenderCommand.java
index cbf7e5d10f318b..3309881a81e528 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryContactMVCRenderCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryContactMVCRenderCommand.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -22,8 +22,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_entry_contact"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryMVCActionCommand.java
index bd2d3a0207093f..ed4855ab7b0306 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryMVCActionCommand.java
@@ -31,11 +31,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,8 +45,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryMVCRenderCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryMVCRenderCommand.java
index e9d2d3e5bcffa0..6dc86844648235 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryMVCRenderCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountEntryMVCRenderCommand.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,8 +26,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountGroupMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountGroupMVCActionCommand.java
index 82fd05e9d52cd0..f233680a42f77b 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountGroupMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountGroupMVCActionCommand.java
@@ -22,8 +22,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
"mvc.command.name=/account_admin/edit_account_group"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountGroupMVCRenderCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountGroupMVCRenderCommand.java
index 37c1808e14fb7e..5d90ce2443f5a6 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountGroupMVCRenderCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountGroupMVCRenderCommand.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
"mvc.command.name=/account_admin/edit_account_group"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountRoleMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountRoleMVCActionCommand.java
index af67fdaacb2a44..a9d3f6d5fd5d01 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountRoleMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountRoleMVCActionCommand.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,8 +35,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_role"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountRoleMVCRenderCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountRoleMVCRenderCommand.java
index c5474443351415..c587a27e7aac8c 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountRoleMVCRenderCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountRoleMVCRenderCommand.java
@@ -9,9 +9,9 @@
import com.liferay.account.constants.AccountPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -21,8 +21,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_role"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserAccountEntriesMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserAccountEntriesMVCActionCommand.java
index c71c2b0369c3b7..77616913f5c8ab 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserAccountEntriesMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserAccountEntriesMVCActionCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.users.admin.constants.UsersAdminPortletKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,10 +25,10 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
- "javax.portlet.name=" + UsersAdminPortletKeys.MY_ORGANIZATIONS,
- "javax.portlet.name=" + UsersAdminPortletKeys.USERS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
+ "jakarta.portlet.name=" + UsersAdminPortletKeys.MY_ORGANIZATIONS,
+ "jakarta.portlet.name=" + UsersAdminPortletKeys.USERS_ADMIN,
"mvc.command.name=/account_admin/edit_account_user_account_entries"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserMVCActionCommand.java
index 3c4b9430d4c034..837a3d60f8d7d9 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserMVCActionCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_user"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserMVCRenderCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserMVCRenderCommand.java
index fc142d305ab41c..98895b1447512c 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserMVCRenderCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUserMVCRenderCommand.java
@@ -26,9 +26,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/edit_account_user"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUsersMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUsersMVCActionCommand.java
index 70c6831ed5cf86..80d77c4bb9b750 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUsersMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/EditAccountUsersMVCActionCommand.java
@@ -23,8 +23,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN,
"mvc.command.name=/account_admin/edit_account_users"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/InviteAccountUsersMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/InviteAccountUsersMVCActionCommand.java
index 4f3f102b4f4635..73264e2890641c 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/InviteAccountUsersMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/InviteAccountUsersMVCActionCommand.java
@@ -22,8 +22,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,8 +33,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/invite_account_users"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountGroupAccountEntriesMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountGroupAccountEntriesMVCActionCommand.java
index 0e4a7015566a3a..4afe2e291442c5 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountGroupAccountEntriesMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountGroupAccountEntriesMVCActionCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_GROUPS_ADMIN,
"mvc.command.name=/account_admin/remove_account_group_account_entries"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountOrganizationsMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountOrganizationsMVCActionCommand.java
index 322a58c8fec4c5..6b0ac2c3b28a81 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountOrganizationsMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountOrganizationsMVCActionCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,8 +25,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/remove_account_organizations"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountRoleUsersMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountRoleUsersMVCActionCommand.java
index 0859d5479272d3..a2a7f4b49898a3 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountRoleUsersMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountRoleUsersMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,8 +22,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/remove_account_role_users"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountUsersMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountUsersMVCActionCommand.java
index 810743af1f43dd..c76f6ee140ecbd 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountUsersMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/RemoveAccountUsersMVCActionCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,8 +25,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/remove_account_users"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/SelectAccountEntryMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/SelectAccountEntryMVCActionCommand.java
index 93e5e933630dd3..3bab82eb22b89b 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/SelectAccountEntryMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/SelectAccountEntryMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/select_account_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/SetUserAccountRolesMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/SetUserAccountRolesMVCActionCommand.java
index 26c1ad7224df58..9fa4329e976bce 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/SetUserAccountRolesMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/SetUserAccountRolesMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,8 +22,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/set_user_account_roles"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateAccountEntryDefaultAddressMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateAccountEntryDefaultAddressMVCActionCommand.java
index e618612fd237ce..43a12066b8242c 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateAccountEntryDefaultAddressMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateAccountEntryDefaultAddressMVCActionCommand.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,8 +28,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/update_account_entry_default_address"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateAccountEntryStatusMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateAccountEntryStatusMVCActionCommand.java
index 3d2d6350b6aa12..13344569ac80fc 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateAccountEntryStatusMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateAccountEntryStatusMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,8 +24,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/update_account_entry_status"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateContactInformationMVCActionCommand.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateContactInformationMVCActionCommand.java
index 378ce41580cdcb..7dd7fba752fa04 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateContactInformationMVCActionCommand.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/UpdateContactInformationMVCActionCommand.java
@@ -40,8 +40,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -51,8 +51,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_admin/update_contact_information"
},
service = MVCActionCommand.class
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/util/TicketUtil.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/util/TicketUtil.java
index 05cfeca31e3564..ad65b252d17e40 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/util/TicketUtil.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/action/util/TicketUtil.java
@@ -13,7 +13,7 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/filter/AccountEntriesAdminPortletFilter.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/filter/AccountEntriesAdminPortletFilter.java
index 9d874851a5e6d9..d42ab23f68a227 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/filter/AccountEntriesAdminPortletFilter.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/filter/AccountEntriesAdminPortletFilter.java
@@ -17,27 +17,27 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.roles.admin.constants.RolesAdminPortletKeys;
-import java.io.IOException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.filter.ActionFilter;
+import jakarta.portlet.filter.FilterChain;
+import jakarta.portlet.filter.FilterConfig;
+import jakarta.portlet.filter.PortletFilter;
+import jakarta.portlet.filter.RenderFilter;
+import jakarta.portlet.filter.ResourceFilter;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.filter.ActionFilter;
-import javax.portlet.filter.FilterChain;
-import javax.portlet.filter.FilterConfig;
-import javax.portlet.filter.PortletFilter;
-import javax.portlet.filter.RenderFilter;
-import javax.portlet.filter.ResourceFilter;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,7 +46,7 @@
* @author Pei-Jung Lan
*/
@Component(
- property = "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ property = "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
service = PortletFilter.class
)
public class AccountEntriesAdminPortletFilter
@@ -179,7 +179,7 @@ public void init(FilterConfig filterConfig) {
private Portal _portal;
@Reference(
- target = "(javax.portlet.name=" + RolesAdminPortletKeys.ROLES_ADMIN + ")",
+ target = "(jakarta.portlet.name=" + RolesAdminPortletKeys.ROLES_ADMIN + ")",
unbind = "-"
)
private Portlet _portlet;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/filter/AccountUsersAdminPortletFilter.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/filter/AccountUsersAdminPortletFilter.java
index 80c01414c08a60..dbef91565e5a9e 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/filter/AccountUsersAdminPortletFilter.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/portlet/filter/AccountUsersAdminPortletFilter.java
@@ -12,22 +12,22 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.users.admin.constants.UsersAdminPortletKeys;
-import java.io.IOException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.filter.ActionFilter;
+import jakarta.portlet.filter.FilterChain;
+import jakarta.portlet.filter.FilterConfig;
+import jakarta.portlet.filter.PortletFilter;
+import jakarta.portlet.filter.RenderFilter;
+import jakarta.portlet.filter.ResourceFilter;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.filter.ActionFilter;
-import javax.portlet.filter.FilterChain;
-import javax.portlet.filter.FilterConfig;
-import javax.portlet.filter.PortletFilter;
-import javax.portlet.filter.RenderFilter;
-import javax.portlet.filter.ResourceFilter;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,8 +37,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_USERS_ADMIN
},
service = PortletFilter.class
)
@@ -117,7 +117,7 @@ public void init(FilterConfig filterConfig) {
}
@Reference(
- target = "(javax.portlet.name=" + UsersAdminPortletKeys.USERS_ADMIN + ")",
+ target = "(jakarta.portlet.name=" + UsersAdminPortletKeys.USERS_ADMIN + ")",
unbind = "-"
)
private Portlet _portlet;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/AccountMembershipPostJSPDynamicInclude.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/AccountMembershipPostJSPDynamicInclude.java
index 3f5133ea9a045c..0acc2dedc04a25 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/AccountMembershipPostJSPDynamicInclude.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/AccountMembershipPostJSPDynamicInclude.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.servlet.taglib.BaseJSPDynamicInclude;
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/util/AccountUserActionDropdownItemsProvider.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/util/AccountUserActionDropdownItemsProvider.java
index 5272a2535a56f9..7f7d7704f1e8e0 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/util/AccountUserActionDropdownItemsProvider.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/util/AccountUserActionDropdownItemsProvider.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Albert Lee
diff --git a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/util/ContactInformationActionDropdownItemsProvider.java b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/util/ContactInformationActionDropdownItemsProvider.java
index bfb49b61a454c3..619387a27aa6ba 100644
--- a/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/util/ContactInformationActionDropdownItemsProvider.java
+++ b/modules/apps/account/account-admin-web/src/main/java/com/liferay/account/admin/web/internal/servlet/taglib/util/ContactInformationActionDropdownItemsProvider.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Danny Situ
diff --git a/modules/apps/account/account-admin-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/account/account-admin-web/src/main/resources/META-INF/resources/init.jsp
index 5fe39c45165527..c8a5a690a238e1 100644
--- a/modules/apps/account/account-admin-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/account/account-admin-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -161,16 +161,16 @@ page import="com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEn
page import="com.liferay.taglib.search.ResultRow" %><%@
page import="com.liferay.users.admin.constants.UsersAdminPortletKeys" %>
+<%@ page import="jakarta.portlet.ActionRequest" %><%@
+page import="jakarta.portlet.PortletMode" %><%@
+page import="jakarta.portlet.PortletURL" %><%@
+page import="jakarta.portlet.WindowState" %>
+
<%@ page import="java.util.Collections" %><%@
page import="java.util.List" %><%@
page import="java.util.Map" %><%@
page import="java.util.Objects" %>
-<%@ page import="javax.portlet.ActionRequest" %><%@
-page import="javax.portlet.PortletMode" %><%@
-page import="javax.portlet.PortletURL" %><%@
-page import="javax.portlet.WindowState" %>
-
diff --git a/modules/apps/account/account-service/build.gradle b/modules/apps/account/account-service/build.gradle
index 960cfc3e168ba6..c79dc3ab042c3c 100644
--- a/modules/apps/account/account-service/build.gradle
+++ b/modules/apps/account/account-service/build.gradle
@@ -5,12 +5,12 @@ buildService {
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "com.sun.mail", name: "jakarta.mail", version: "1.6.6"
compileOnly group: "commons-validator", name: "commons-validator", version: "1.7"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.mail", name: "jakarta.mail-api", version: "2.1.3"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/manager/CurrentAccountEntryManagerStore.java b/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/manager/CurrentAccountEntryManagerStore.java
index 3114655832642f..09efcd8721a8b2 100644
--- a/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/manager/CurrentAccountEntryManagerStore.java
+++ b/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/manager/CurrentAccountEntryManagerStore.java
@@ -20,7 +20,7 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.PortletKeys;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/model/AccountEntryAssetRenderer.java b/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/model/AccountEntryAssetRenderer.java
index f3febb1b652732..b2e27b662277d2 100644
--- a/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/model/AccountEntryAssetRenderer.java
+++ b/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/model/AccountEntryAssetRenderer.java
@@ -8,13 +8,13 @@
import com.liferay.account.model.AccountEntry;
import com.liferay.asset.kernel.model.BaseAssetRenderer;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Drew Brokke
diff --git a/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/model/AccountEntryAssetRendererFactory.java b/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/model/AccountEntryAssetRendererFactory.java
index c261687d8a9f31..5c68288bd03048 100644
--- a/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/model/AccountEntryAssetRendererFactory.java
+++ b/modules/apps/account/account-service/src/main/java/com/liferay/account/internal/model/AccountEntryAssetRendererFactory.java
@@ -20,7 +20,7 @@
* @author Drew Brokke
*/
@Component(
- property = "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ property = "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
service = AssetRendererFactory.class
)
public class AccountEntryAssetRendererFactory
diff --git a/modules/apps/account/account-service/src/main/java/com/liferay/account/service/impl/AccountEntryUserRelLocalServiceImpl.java b/modules/apps/account/account-service/src/main/java/com/liferay/account/service/impl/AccountEntryUserRelLocalServiceImpl.java
index 04d48172441326..272ef26d66b322 100644
--- a/modules/apps/account/account-service/src/main/java/com/liferay/account/service/impl/AccountEntryUserRelLocalServiceImpl.java
+++ b/modules/apps/account/account-service/src/main/java/com/liferay/account/service/impl/AccountEntryUserRelLocalServiceImpl.java
@@ -56,6 +56,12 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.mail.internet.InternetAddress;
+
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.WindowState;
+
import java.time.Month;
import java.util.ArrayList;
@@ -67,12 +73,6 @@
import java.util.Set;
import java.util.concurrent.TimeUnit;
-import javax.mail.internet.InternetAddress;
-
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.WindowState;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/account/account-test/src/testIntegration/java/com/liferay/account/admin/web/internal/portlet/action/test/InviteAccountUsersMVCActionCommandTest.java b/modules/apps/account/account-test/src/testIntegration/java/com/liferay/account/admin/web/internal/portlet/action/test/InviteAccountUsersMVCActionCommandTest.java
index 576f7e3d05a7e8..8b4b81b053afab 100644
--- a/modules/apps/account/account-test/src/testIntegration/java/com/liferay/account/admin/web/internal/portlet/action/test/InviteAccountUsersMVCActionCommandTest.java
+++ b/modules/apps/account/account-test/src/testIntegration/java/com/liferay/account/admin/web/internal/portlet/action/test/InviteAccountUsersMVCActionCommandTest.java
@@ -35,10 +35,10 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.List;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/adaptive-media/adaptive-media-api/build.gradle b/modules/apps/adaptive-media/adaptive-media-api/build.gradle
index 151190c6a297df..6073d79a941501 100644
--- a/modules/apps/adaptive-media/adaptive-media-api/build.gradle
+++ b/modules/apps/adaptive-media/adaptive-media-api/build.gradle
@@ -1,6 +1,6 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/adaptive-media/adaptive-media-api/src/main/java/com/liferay/adaptive/media/handler/AMRequestHandler.java b/modules/apps/adaptive-media/adaptive-media-api/src/main/java/com/liferay/adaptive/media/handler/AMRequestHandler.java
index 5ca1dbaa2ffefa..68b7f28d89da08 100644
--- a/modules/apps/adaptive-media/adaptive-media-api/src/main/java/com/liferay/adaptive/media/handler/AMRequestHandler.java
+++ b/modules/apps/adaptive-media/adaptive-media-api/src/main/java/com/liferay/adaptive/media/handler/AMRequestHandler.java
@@ -7,10 +7,10 @@
import com.liferay.adaptive.media.AdaptiveMedia;
-import java.io.IOException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
/**
* Handles upcoming requests for a particular kind of media (i.e., media
diff --git a/modules/apps/adaptive-media/adaptive-media-blogs-web/build.gradle b/modules/apps/adaptive-media/adaptive-media-blogs-web/build.gradle
index 88b49c38b457a7..b914b748c4672f 100644
--- a/modules/apps/adaptive-media/adaptive-media-blogs-web/build.gradle
+++ b/modules/apps/adaptive-media/adaptive-media-blogs-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:adaptive-media:adaptive-media-api")
compileOnly project(":apps:adaptive-media:adaptive-media-content-transformer-api")
diff --git a/modules/apps/adaptive-media/adaptive-media-blogs-web/src/main/java/com/liferay/adaptive/media/blogs/web/internal/portlet/filter/BlogsPortletFilter.java b/modules/apps/adaptive-media/adaptive-media-blogs-web/src/main/java/com/liferay/adaptive/media/blogs/web/internal/portlet/filter/BlogsPortletFilter.java
index 12c780919464be..34341271dd85ba 100644
--- a/modules/apps/adaptive-media/adaptive-media-blogs-web/src/main/java/com/liferay/adaptive/media/blogs/web/internal/portlet/filter/BlogsPortletFilter.java
+++ b/modules/apps/adaptive-media/adaptive-media-blogs-web/src/main/java/com/liferay/adaptive/media/blogs/web/internal/portlet/filter/BlogsPortletFilter.java
@@ -16,21 +16,21 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.filter.FilterChain;
+import jakarta.portlet.filter.FilterConfig;
+import jakarta.portlet.filter.PortletFilter;
+import jakarta.portlet.filter.RenderFilter;
+import jakarta.portlet.filter.RenderResponseWrapper;
+
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.filter.FilterChain;
-import javax.portlet.filter.FilterConfig;
-import javax.portlet.filter.PortletFilter;
-import javax.portlet.filter.RenderFilter;
-import javax.portlet.filter.RenderResponseWrapper;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
* @author Alejandro Tardín
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = PortletFilter.class
)
public class BlogsPortletFilter implements RenderFilter {
diff --git a/modules/apps/adaptive-media/adaptive-media-editor-configuration/build.gradle b/modules/apps/adaptive-media/adaptive-media-editor-configuration/build.gradle
index e0867b96825680..34acc1bb6b27c0 100644
--- a/modules/apps/adaptive-media/adaptive-media-editor-configuration/build.gradle
+++ b/modules/apps/adaptive-media/adaptive-media-editor-configuration/build.gradle
@@ -1,6 +1,6 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:adaptive-media:adaptive-media-image-api")
compileOnly project(":apps:adaptive-media:adaptive-media-image-item-selector-api")
diff --git a/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/BaseAMEditorConfigContributor.java b/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/BaseAMEditorConfigContributor.java
index ae4239d75dfb28..0cb91729c5b64b 100644
--- a/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/BaseAMEditorConfigContributor.java
+++ b/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/BaseAMEditorConfigContributor.java
@@ -17,11 +17,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletURL;
+
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletURL;
-
import org.osgi.service.component.annotations.Reference;
/**
diff --git a/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/BlogsAMEditorConfigContributor.java b/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/BlogsAMEditorConfigContributor.java
index b337268770f7ec..84e1752e112eb5 100644
--- a/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/BlogsAMEditorConfigContributor.java
+++ b/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/BlogsAMEditorConfigContributor.java
@@ -21,8 +21,9 @@
@Component(
property = {
"editor.config.key=contentEditor", "editor.name=alloyeditor",
- "editor.name=ckeditor", "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "editor.name=ckeditor",
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
"service.ranking:Integer=101"
},
service = EditorConfigContributor.class
diff --git a/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/JournalAMEditorConfigContributor.java b/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/JournalAMEditorConfigContributor.java
index 3059aa36aeceff..737233cbb126d1 100644
--- a/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/JournalAMEditorConfigContributor.java
+++ b/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/main/java/com/liferay/adaptive/media/editor/configuration/internal/JournalAMEditorConfigContributor.java
@@ -22,7 +22,7 @@
property = {
"editor.name=alloyeditor", "editor.name=ckeditor",
"editor.name=ckeditor_classic",
- "javax.portlet.name=" + JournalPortletKeys.JOURNAL,
+ "jakarta.portlet.name=" + JournalPortletKeys.JOURNAL,
"service.ranking:Integer=101"
},
service = EditorConfigContributor.class
diff --git a/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/test/java/com/liferay/adaptive/media/editor/configuration/internal/BaseAMEditorConfigContributorTestCase.java b/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/test/java/com/liferay/adaptive/media/editor/configuration/internal/BaseAMEditorConfigContributorTestCase.java
index 72308bc2cfe503..8e1e7b8cabf548 100644
--- a/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/test/java/com/liferay/adaptive/media/editor/configuration/internal/BaseAMEditorConfigContributorTestCase.java
+++ b/modules/apps/adaptive-media/adaptive-media-editor-configuration/src/test/java/com/liferay/adaptive/media/editor/configuration/internal/BaseAMEditorConfigContributorTestCase.java
@@ -23,6 +23,8 @@
import com.liferay.portal.kernel.test.util.RandomTestUtil;
import com.liferay.portal.kernel.theme.ThemeDisplay;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -32,8 +34,6 @@
import java.util.Map;
import java.util.function.Predicate;
-import javax.portlet.PortletURL;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/modules/apps/adaptive-media/adaptive-media-image-impl/build.gradle b/modules/apps/adaptive-media/adaptive-media-image-impl/build.gradle
index ad3d9677497118..52cd435ede8869 100644
--- a/modules/apps/adaptive-media/adaptive-media-image-impl/build.gradle
+++ b/modules/apps/adaptive-media/adaptive-media-image-impl/build.gradle
@@ -2,10 +2,10 @@ dependencies {
compileInclude group: "com.liferay", name: "com.drew.metadata", version: "2.19.0.LIFERAY-PATCHED-1"
compileOnly group: "com.adobe.xmp", name: "xmpcore", version: "6.1.11"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/adaptive-media/adaptive-media-image-impl/src/main/java/com/liferay/adaptive/media/image/internal/configuration/AMImageConfigurationHelperImpl.java b/modules/apps/adaptive-media/adaptive-media-image-impl/src/main/java/com/liferay/adaptive/media/image/internal/configuration/AMImageConfigurationHelperImpl.java
index 1502424cf73151..4416aa278aa0d1 100644
--- a/modules/apps/adaptive-media/adaptive-media-image-impl/src/main/java/com/liferay/adaptive/media/image/internal/configuration/AMImageConfigurationHelperImpl.java
+++ b/modules/apps/adaptive-media/adaptive-media-image-impl/src/main/java/com/liferay/adaptive/media/image/internal/configuration/AMImageConfigurationHelperImpl.java
@@ -26,6 +26,9 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.ValidatorException;
+
import java.io.IOException;
import java.io.Serializable;
@@ -38,9 +41,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.portlet.PortletPreferences;
-import javax.portlet.ValidatorException;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/adaptive-media/adaptive-media-image-impl/src/main/java/com/liferay/adaptive/media/image/internal/handler/AMImageRequestHandler.java b/modules/apps/adaptive-media/adaptive-media-image-impl/src/main/java/com/liferay/adaptive/media/image/internal/handler/AMImageRequestHandler.java
index bc7ca37c474b24..cb54a64dca6e86 100644
--- a/modules/apps/adaptive-media/adaptive-media-image-impl/src/main/java/com/liferay/adaptive/media/image/internal/handler/AMImageRequestHandler.java
+++ b/modules/apps/adaptive-media/adaptive-media-image-impl/src/main/java/com/liferay/adaptive/media/image/internal/handler/AMImageRequestHandler.java
@@ -27,13 +27,13 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/adaptive-media/adaptive-media-image-impl/src/test/java/com/liferay/adaptive/media/image/internal/handler/AMImageRequestHandlerTest.java b/modules/apps/adaptive-media/adaptive-media-image-impl/src/test/java/com/liferay/adaptive/media/image/internal/handler/AMImageRequestHandlerTest.java
index 743dcd6671036b..8dd1282853b38c 100644
--- a/modules/apps/adaptive-media/adaptive-media-image-impl/src/test/java/com/liferay/adaptive/media/image/internal/handler/AMImageRequestHandlerTest.java
+++ b/modules/apps/adaptive-media/adaptive-media-image-impl/src/test/java/com/liferay/adaptive/media/image/internal/handler/AMImageRequestHandlerTest.java
@@ -30,6 +30,8 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.test.rule.LiferayUnitTestRule;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.InputStream;
import java.util.Arrays;
@@ -39,8 +41,6 @@
import java.util.function.Function;
import java.util.function.Predicate;
-import javax.servlet.http.HttpServletRequest;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/adaptive-media/adaptive-media-image-taglib/build.gradle b/modules/apps/adaptive-media/adaptive-media-image-taglib/build.gradle
index 383b8fbac83f61..aa4c6612d94ee8 100644
--- a/modules/apps/adaptive-media/adaptive-media-image-taglib/build.gradle
+++ b/modules/apps/adaptive-media/adaptive-media-image-taglib/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:adaptive-media:adaptive-media-image-api")
diff --git a/modules/apps/adaptive-media/adaptive-media-image-taglib/src/main/java/com/liferay/adaptive/media/image/taglib/servlet/taglib/AMImageImgTag.java b/modules/apps/adaptive-media/adaptive-media-image-taglib/src/main/java/com/liferay/adaptive/media/image/taglib/servlet/taglib/AMImageImgTag.java
index 99619f3b704aa9..9846378c9017d4 100644
--- a/modules/apps/adaptive-media/adaptive-media-image-taglib/src/main/java/com/liferay/adaptive/media/image/taglib/servlet/taglib/AMImageImgTag.java
+++ b/modules/apps/adaptive-media/adaptive-media-image-taglib/src/main/java/com/liferay/adaptive/media/image/taglib/servlet/taglib/AMImageImgTag.java
@@ -16,15 +16,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.AttributesTagSupport;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.JspWriter;
+import jakarta.servlet.jsp.tagext.BodyTag;
+
import java.io.IOException;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.BodyTag;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
diff --git a/modules/apps/adaptive-media/adaptive-media-image-web/build.gradle b/modules/apps/adaptive-media/adaptive-media-image-web/build.gradle
index e18663781bc6e8..f7678cecfe5e5b 100644
--- a/modules/apps/adaptive-media/adaptive-media-image-web/build.gradle
+++ b/modules/apps/adaptive-media/adaptive-media-image-web/build.gradle
@@ -1,6 +1,6 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:adaptive-media:adaptive-media-api")
diff --git a/modules/apps/adaptive-media/adaptive-media-journal-web/src/main/java/com/liferay/adaptive/media/journal/web/internal/transformer/AMJournalTransformerListener.java b/modules/apps/adaptive-media/adaptive-media-journal-web/src/main/java/com/liferay/adaptive/media/journal/web/internal/transformer/AMJournalTransformerListener.java
index 76a61879c8bd09..5c70d389312e21 100644
--- a/modules/apps/adaptive-media/adaptive-media-journal-web/src/main/java/com/liferay/adaptive/media/journal/web/internal/transformer/AMJournalTransformerListener.java
+++ b/modules/apps/adaptive-media/adaptive-media-journal-web/src/main/java/com/liferay/adaptive/media/journal/web/internal/transformer/AMJournalTransformerListener.java
@@ -22,7 +22,7 @@
* @author Alejandro Tardín
*/
@Component(
- property = "javax.portlet.name=" + JournalPortletKeys.JOURNAL,
+ property = "jakarta.portlet.name=" + JournalPortletKeys.JOURNAL,
service = TransformerListener.class
)
public class AMJournalTransformerListener extends BaseTransformerListener {
diff --git a/modules/apps/adaptive-media/adaptive-media-upload/build.gradle b/modules/apps/adaptive-media/adaptive-media-upload/build.gradle
index 0e628bae88b924..2d696a6917ec1b 100644
--- a/modules/apps/adaptive-media/adaptive-media-upload/build.gradle
+++ b/modules/apps/adaptive-media/adaptive-media-upload/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.jsoup", name: "jsoup", version: "1.15.3"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:adaptive-media:adaptive-media-api")
diff --git a/modules/apps/adaptive-media/adaptive-media-web/build.gradle b/modules/apps/adaptive-media/adaptive-media-web/build.gradle
index 468cf78b4e55b1..7c68866a2bb807 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/build.gradle
+++ b/modules/apps/adaptive-media/adaptive-media-web/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "org.osgi.service.http.whiteboard", version: "1.1.1.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
- compileOnly group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.1.1"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:adaptive-media:adaptive-media-api")
compileOnly project(":apps:adaptive-media:adaptive-media-image-api")
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/application/list/AMPanelApp.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/application/list/AMPanelApp.java
index 6b1253675b79a8..eb754a97ea2a0b 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/application/list/AMPanelApp.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/application/list/AMPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA + ")"
+ target = "(jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/display/context/AMManagementToolbarDisplayContext.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/display/context/AMManagementToolbarDisplayContext.java
index 345da717c55075..0907334bee5127 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/display/context/AMManagementToolbarDisplayContext.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/display/context/AMManagementToolbarDisplayContext.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Sergio González
*/
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/AMControlPanelEntry.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/AMControlPanelEntry.java
index 583e8f85395842..ae5c5ffb3291ae 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/AMControlPanelEntry.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/AMControlPanelEntry.java
@@ -18,7 +18,7 @@
* @author Alan Huang
*/
@Component(
- property = "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ property = "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
service = ControlPanelEntry.class
)
public class AMControlPanelEntry extends OmniadminControlPanelEntry {
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/AMPortlet.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/AMPortlet.java
index aaf2bb3e7150fe..9e053239ef6de2 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/AMPortlet.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/AMPortlet.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.model.Release;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,15 +27,15 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Adaptive Media",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.always-send-redirect=true",
- "javax.portlet.init-param.mvc-command-names-default-views=/adaptive_media/view",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Adaptive Media",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.always-send-redirect=true",
+ "jakarta.portlet.init-param.mvc-command-names-default-views=/adaptive_media/view",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/AdaptedImagesPercentageMVCResourceCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/AdaptedImagesPercentageMVCResourceCommand.java
index 56096c5cc14481..4d968a993a2bdf 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/AdaptedImagesPercentageMVCResourceCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/AdaptedImagesPercentageMVCResourceCommand.java
@@ -24,14 +24,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.io.Serializable;
import java.util.List;
import java.util.Map;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/adaptive_media/adapted_images_percentage"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/BaseMVCActionCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/BaseMVCActionCommand.java
index 2f8e275dc8a77b..676e4da9614e8a 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/BaseMVCActionCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/BaseMVCActionCommand.java
@@ -10,8 +10,8 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
/**
* @author Sergio González
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/DeleteImageConfigurationEntryMVCActionCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/DeleteImageConfigurationEntryMVCActionCommand.java
index e4e336f1f8a480..64d27507e5a808 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/DeleteImageConfigurationEntryMVCActionCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/DeleteImageConfigurationEntryMVCActionCommand.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/adaptive_media/delete_image_configuration_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/DisableImageConfigurationEntryMVCActionCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/DisableImageConfigurationEntryMVCActionCommand.java
index 0dc48c4ac61c03..ad93b21eee24b9 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/DisableImageConfigurationEntryMVCActionCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/DisableImageConfigurationEntryMVCActionCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/adaptive_media/disable_image_configuration_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EditImageConfigurationEntryMVCActionCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EditImageConfigurationEntryMVCActionCommand.java
index 2c3f473c8d3f69..3cedbc2acd1673 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EditImageConfigurationEntryMVCActionCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EditImageConfigurationEntryMVCActionCommand.java
@@ -25,14 +25,14 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.io.IOException;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,7 +41,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/adaptive_media/edit_image_configuration_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EditImageConfigurationEntryMVCRenderCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EditImageConfigurationEntryMVCRenderCommand.java
index 77101402ab70e0..f6f8d3d4b59fd0 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EditImageConfigurationEntryMVCRenderCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EditImageConfigurationEntryMVCRenderCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/adaptive_media/edit_image_configuration_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EnableImageConfigurationEntryMVCActionCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EnableImageConfigurationEntryMVCActionCommand.java
index 8a113195f0e6fb..3ec406e6eaaa2e 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EnableImageConfigurationEntryMVCActionCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/EnableImageConfigurationEntryMVCActionCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/adaptive_media/enable_image_configuration_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/InfoPanelMVCResourceCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/InfoPanelMVCResourceCommand.java
index ee1a1bb41a5a26..06d89b1f15e97a 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/InfoPanelMVCResourceCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/InfoPanelMVCResourceCommand.java
@@ -16,13 +16,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/adaptive_media/info_panel"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/OptimizeImagesMVCActionCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/OptimizeImagesMVCActionCommand.java
index 2bb4e3b24880d5..7ad08d1a8745e6 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/OptimizeImagesMVCActionCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/OptimizeImagesMVCActionCommand.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.uuid.PortalUUIDUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.io.Serializable;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/adaptive_media/optimize_images"
},
service = MVCActionCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/ViewMVCRenderCommand.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/ViewMVCRenderCommand.java
index 9e239019607d04..377ca0d535492a 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/ViewMVCRenderCommand.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/action/ViewMVCRenderCommand.java
@@ -15,13 +15,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.function.Predicate;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
"mvc.command.name=/", "mvc.command.name=/adaptive_media/view"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/configuration/icon/OptimizeImagesPortletConfigurationIcon.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/configuration/icon/OptimizeImagesPortletConfigurationIcon.java
index f75216485531f3..288fcbee8df846 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/configuration/icon/OptimizeImagesPortletConfigurationIcon.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/portlet/configuration/icon/OptimizeImagesPortletConfigurationIcon.java
@@ -23,10 +23,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Collection;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Collection;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
+ property = "jakarta.portlet.name=" + AMPortletKeys.ADAPTIVE_MEDIA,
service = PortletConfigurationIcon.class
)
public class OptimizeImagesPortletConfigurationIcon
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/search/ImageConfigurationEntriesChecker.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/search/ImageConfigurationEntriesChecker.java
index d5d129e789c32a..5f54aa270eedb0 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/search/ImageConfigurationEntriesChecker.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/search/ImageConfigurationEntriesChecker.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.dao.search.RowChecker;
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Sergio González
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/servlet/AMServlet.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/servlet/AMServlet.java
index 15bda06bf97920..0b7f7d788d06d6 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/servlet/AMServlet.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/servlet/AMServlet.java
@@ -21,17 +21,17 @@
import com.liferay.portal.kernel.util.ContentTypes;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/servlet/filter/AMAuthVerifierFilter.java b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/servlet/filter/AMAuthVerifierFilter.java
index fef4945d86acfa..415343333bae54 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/servlet/filter/AMAuthVerifierFilter.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/java/com/liferay/adaptive/media/web/internal/servlet/filter/AMAuthVerifierFilter.java
@@ -8,7 +8,7 @@
import com.liferay.adaptive.media.web.internal.constants.AMWebConstants;
import com.liferay.portal.servlet.filters.authverifier.AuthVerifierFilter;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/adaptive-media/adaptive-media-web/src/main/resources/META-INF/resources/init.jsp
index 7f17416979c59e..8a78a3d6aba519 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/adaptive-media/adaptive-media-web/src/test/java/com/liferay/adaptive/media/web/internal/servlet/AMServletTest.java b/modules/apps/adaptive-media/adaptive-media-web/src/test/java/com/liferay/adaptive/media/web/internal/servlet/AMServletTest.java
index 8c2542c33a4f39..2ca4b6168f05f0 100644
--- a/modules/apps/adaptive-media/adaptive-media-web/src/test/java/com/liferay/adaptive/media/web/internal/servlet/AMServletTest.java
+++ b/modules/apps/adaptive-media/adaptive-media-web/src/test/java/com/liferay/adaptive/media/web/internal/servlet/AMServletTest.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.test.util.RandomTestUtil;
import com.liferay.portal.test.rule.LiferayUnitTestRule;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/address/address-impl/build.gradle b/modules/apps/address/address-impl/build.gradle
index d5c3a68c765ea4..6fdc74d8192e72 100644
--- a/modules/apps/address/address-impl/build.gradle
+++ b/modules/apps/address/address-impl/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:change-tracking:change-tracking-spi")
diff --git a/modules/apps/address/address-web/build.gradle b/modules/apps/address/address-web/build.gradle
index d7f697fe5888a4..c537d693405d24 100644
--- a/modules/apps/address/address-web/build.gradle
+++ b/modules/apps/address/address-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:change-tracking:change-tracking-spi")
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/application/list/CountriesManagementAdminPanelApp.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/application/list/CountriesManagementAdminPanelApp.java
index 1b731c309cf8b9..bfa332c8650eaf 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/application/list/CountriesManagementAdminPanelApp.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/application/list/CountriesManagementAdminPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/AddressCTDisplayRenderer.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/AddressCTDisplayRenderer.java
index 26615b7fa59fee..13fe43bd9be0a9 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/AddressCTDisplayRenderer.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/AddressCTDisplayRenderer.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.users.admin.constants.UsersAdminPortletKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/CountryCTDisplayRenderer.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/CountryCTDisplayRenderer.java
index 4f1e9b302ab012..a767c978956262 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/CountryCTDisplayRenderer.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/CountryCTDisplayRenderer.java
@@ -15,11 +15,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/RegionCTDisplayRenderer.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/RegionCTDisplayRenderer.java
index 66c30d4d217cfc..e35f0ad341d285 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/RegionCTDisplayRenderer.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/change/tracking/spi/display/RegionCTDisplayRenderer.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/display/context/CountriesManagementAdminManagementToolbarDisplayContext.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/display/context/CountriesManagementAdminManagementToolbarDisplayContext.java
index 18357bd9dd264f..ccdb1c9a8eb263 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/display/context/CountriesManagementAdminManagementToolbarDisplayContext.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/display/context/CountriesManagementAdminManagementToolbarDisplayContext.java
@@ -30,12 +30,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/display/context/RegionsManagementToolbarDisplayContext.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/display/context/RegionsManagementToolbarDisplayContext.java
index ee585126bbab92..5107355f51fde6 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/display/context/RegionsManagementToolbarDisplayContext.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/display/context/RegionsManagementToolbarDisplayContext.java
@@ -30,12 +30,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
/**
* @author Pei-Jung Lan
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/frontend/taglib/servlet/taglib/CountryDetailsScreenNavigationEntry.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/frontend/taglib/servlet/taglib/CountryDetailsScreenNavigationEntry.java
index 1657db436ffe1f..cf51b896acf2f5 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/frontend/taglib/servlet/taglib/CountryDetailsScreenNavigationEntry.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/frontend/taglib/servlet/taglib/CountryDetailsScreenNavigationEntry.java
@@ -9,11 +9,11 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.model.Country;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/frontend/taglib/servlet/taglib/CountryRegionsScreenNavigationEntry.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/frontend/taglib/servlet/taglib/CountryRegionsScreenNavigationEntry.java
index 6f93ed74b5b678..745f4d4caccfd2 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/frontend/taglib/servlet/taglib/CountryRegionsScreenNavigationEntry.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/frontend/taglib/servlet/taglib/CountryRegionsScreenNavigationEntry.java
@@ -10,11 +10,11 @@
import com.liferay.portal.kernel.model.Country;
import com.liferay.portal.kernel.model.User;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/CountriesManagementAdminControlPanelEntry.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/CountriesManagementAdminControlPanelEntry.java
index 9780bfff05d987..80e97e4279e196 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/CountriesManagementAdminControlPanelEntry.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/CountriesManagementAdminControlPanelEntry.java
@@ -15,7 +15,7 @@
* @author Pei-Jung Lan
*/
@Component(
- property = "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ property = "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
service = ControlPanelEntry.class
)
public class CountriesManagementAdminControlPanelEntry
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/CountriesManagementAdminPortlet.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/CountriesManagementAdminPortlet.java
index dd766d7070e986..df1c614608337f 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/CountriesManagementAdminPortlet.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/CountriesManagementAdminPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.address.web.internal.constants.AddressPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -22,14 +22,14 @@
"com.liferay.portlet.private-request-attributes=false",
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Countries Management",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Countries Management",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/DeleteCountryMVCActionCommand.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/DeleteCountryMVCActionCommand.java
index 68f9bd90dfc116..5b49561e757b58 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/DeleteCountryMVCActionCommand.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/DeleteCountryMVCActionCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/address/delete_country"
},
service = MVCActionCommand.class
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/DeleteRegionMVCActionCommand.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/DeleteRegionMVCActionCommand.java
index b35a53555a3133..2d09e705c7670c 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/DeleteRegionMVCActionCommand.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/DeleteRegionMVCActionCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/address/delete_region"
},
service = MVCActionCommand.class
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditCountryMVCActionCommand.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditCountryMVCActionCommand.java
index d6ebb4fed8dabd..1339a97000cce3 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditCountryMVCActionCommand.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditCountryMVCActionCommand.java
@@ -27,14 +27,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
+
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -43,7 +43,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/address/edit_country"
},
service = MVCActionCommand.class
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditCountryMVCRenderCommand.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditCountryMVCRenderCommand.java
index 65352f2a47a601..e772be6b9d9a49 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditCountryMVCRenderCommand.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditCountryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.address.web.internal.constants.AddressPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/address/edit_country"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditRegionMVCActionCommand.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditRegionMVCActionCommand.java
index 72dce8e9504075..7171706d9f1b2d 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditRegionMVCActionCommand.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditRegionMVCActionCommand.java
@@ -24,14 +24,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
+
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/address/edit_region"
},
service = MVCActionCommand.class
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditRegionMVCRenderCommand.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditRegionMVCRenderCommand.java
index f21e0f7bc5055e..52456495b64076 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditRegionMVCRenderCommand.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/EditRegionMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.address.web.internal.constants.AddressPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/address/edit_region"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/UpdateCountryStatusMVCActionCommand.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/UpdateCountryStatusMVCActionCommand.java
index faede1e9ce4edc..8b5b3f5f97aa23 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/UpdateCountryStatusMVCActionCommand.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/UpdateCountryStatusMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/address/update_country_status"
},
service = MVCActionCommand.class
diff --git a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/UpdateRegionStatusMVCActionCommand.java b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/UpdateRegionStatusMVCActionCommand.java
index 490200180294db..8807cdf6ef7f7a 100644
--- a/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/UpdateRegionStatusMVCActionCommand.java
+++ b/modules/apps/address/address-web/src/main/java/com/liferay/address/web/internal/portlet/action/UpdateRegionStatusMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + AddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/address/update_region_status"
},
service = MVCActionCommand.class
diff --git a/modules/apps/address/address-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/address/address-web/src/main/resources/META-INF/resources/init.jsp
index d062685561124e..57f936c66c0e2f 100644
--- a/modules/apps/address/address-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/address/address-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/ai-creator/ai-creator-openai-api/build.gradle b/modules/apps/ai-creator/ai-creator-openai-api/build.gradle
index 9de80a9c2ec515..a7c4873eaf50ea 100644
--- a/modules/apps/ai-creator/ai-creator-openai-api/build.gradle
+++ b/modules/apps/ai-creator/ai-creator-openai-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/ai-creator/ai-creator-openai-impl/build.gradle b/modules/apps/ai-creator/ai-creator-openai-impl/build.gradle
index e6442f7ab8adc2..9d3ddc5e81ba18 100644
--- a/modules/apps/ai-creator/ai-creator-openai-impl/build.gradle
+++ b/modules/apps/ai-creator/ai-creator-openai-impl/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/build.gradle b/modules/apps/ai-creator/ai-creator-openai-web/build.gradle
index 8d64ed0eafc27e..db5dfc28ed21b1 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/build.gradle
+++ b/modules/apps/ai-creator/ai-creator-openai-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
compileOnly group: "commons-lang", name: "commons-lang", version: "2.6"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:ai-creator:ai-creator-openai-api")
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/configuration/admin/display/AICreatorOpenAIPortalSettingsConfigurationScreenWrapper.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/configuration/admin/display/AICreatorOpenAIPortalSettingsConfigurationScreenWrapper.java
index 944677658a17af..b4025a71fb59c1 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/configuration/admin/display/AICreatorOpenAIPortalSettingsConfigurationScreenWrapper.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/configuration/admin/display/AICreatorOpenAIPortalSettingsConfigurationScreenWrapper.java
@@ -13,11 +13,11 @@
import com.liferay.portal.settings.configuration.admin.display.PortalSettingsConfigurationScreenContributor;
import com.liferay.portal.settings.configuration.admin.display.PortalSettingsConfigurationScreenFactory;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/configuration/admin/display/AICreatorOpenAISiteSettingsConfigurationScreenWrapper.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/configuration/admin/display/AICreatorOpenAISiteSettingsConfigurationScreenWrapper.java
index 81025a874af36b..c3d1b66efe4a7c 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/configuration/admin/display/AICreatorOpenAISiteSettingsConfigurationScreenWrapper.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/configuration/admin/display/AICreatorOpenAISiteSettingsConfigurationScreenWrapper.java
@@ -13,11 +13,11 @@
import com.liferay.site.settings.configuration.admin.display.SiteSettingsConfigurationScreenContributor;
import com.liferay.site.settings.configuration.admin.display.SiteSettingsConfigurationScreenFactory;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAICompanyConfigurationDisplayContext.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAICompanyConfigurationDisplayContext.java
index 0f9edc350aab57..3ace43915ac337 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAICompanyConfigurationDisplayContext.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAICompanyConfigurationDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Lourdes Fernández Besada
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAIDisplayContext.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAIDisplayContext.java
index 077b97208cad1e..14cb79a273dacd 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAIDisplayContext.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAIDisplayContext.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Map;
+import jakarta.portlet.ResourceURL;
-import javax.portlet.ResourceURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
/**
* @author Lourdes Fernández Besada
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAIGroupConfigurationDisplayContext.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAIGroupConfigurationDisplayContext.java
index bd9df28afa4bec..8b604d417a861f 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAIGroupConfigurationDisplayContext.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/AICreatorOpenAIGroupConfigurationDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Lourdes Fernández Besada
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/BaseAICreatorOpenAIConfigurationDisplayContext.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/BaseAICreatorOpenAIConfigurationDisplayContext.java
index d98abac4c29f86..7f670a2577df42 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/BaseAICreatorOpenAIConfigurationDisplayContext.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/BaseAICreatorOpenAIConfigurationDisplayContext.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Lourdes Fernández Besada
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/factory/AICreatorOpenAIMenuItemFactoryImpl.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/factory/AICreatorOpenAIMenuItemFactoryImpl.java
index 46584119390ef4..bff4d8926021b7 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/factory/AICreatorOpenAIMenuItemFactoryImpl.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/display/context/factory/AICreatorOpenAIMenuItemFactoryImpl.java
@@ -23,7 +23,7 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletMode;
+import jakarta.portlet.PortletMode;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/editor/configuration/AICreatorOpenAIEditorConfigContributor.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/editor/configuration/AICreatorOpenAIEditorConfigContributor.java
index a7055793f11f9a..471bde6c4ccdbd 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/editor/configuration/AICreatorOpenAIEditorConfigContributor.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/editor/configuration/AICreatorOpenAIEditorConfigContributor.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Map;
+import jakarta.portlet.PortletMode;
-import javax.portlet.PortletMode;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
@Component(
property = {
"editor.config.key=rich_text",
- "javax.portlet.name=" + JournalPortletKeys.JOURNAL
+ "jakarta.portlet.name=" + JournalPortletKeys.JOURNAL
},
service = EditorConfigContributor.class
)
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/AICreatorOpenAIPortlet.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/AICreatorOpenAIPortlet.java
index a039376ecaa644..dd6da9b439896e 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/AICreatorOpenAIPortlet.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/AICreatorOpenAIPortlet.java
@@ -10,12 +10,12 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
import com.liferay.portal.kernel.util.Portal;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,11 +32,11 @@
"com.liferay.portlet.instanceable=false",
"com.liferay.portlet.system=true",
"com.liferay.portlet.use-default-template=false",
- "javax.portlet.display-name=AI Creator OpenAI",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AICreatorOpenAIPortletKeys.AI_CREATOR_OPENAI,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=AI Creator OpenAI",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AICreatorOpenAIPortletKeys.AI_CREATOR_OPENAI,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/BaseMVCResourceCommand.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/BaseMVCResourceCommand.java
index 75707c9dfd37cb..2d6b362150c33b 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/BaseMVCResourceCommand.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/BaseMVCResourceCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/BaseSaveConfigurationMVCActionCommand.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/BaseSaveConfigurationMVCActionCommand.java
index f1513ee7660682..f1dcc5c8a75a61 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/BaseSaveConfigurationMVCActionCommand.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/BaseSaveConfigurationMVCActionCommand.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/GetCompletionMVCResourceCommand.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/GetCompletionMVCResourceCommand.java
index 3445b37f902289..8b5361b8e1012e 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/GetCompletionMVCResourceCommand.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/GetCompletionMVCResourceCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AICreatorOpenAIPortletKeys.AI_CREATOR_OPENAI,
+ "jakarta.portlet.name=" + AICreatorOpenAIPortletKeys.AI_CREATOR_OPENAI,
"mvc.command.name=/ai_creator_openai/get_completion"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/GetGenerationsMVCResourceCommand.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/GetGenerationsMVCResourceCommand.java
index de6b9d9b7d3b37..a71f9157c5511f 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/GetGenerationsMVCResourceCommand.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/GetGenerationsMVCResourceCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AICreatorOpenAIPortletKeys.AI_CREATOR_OPENAI,
+ "jakarta.portlet.name=" + AICreatorOpenAIPortletKeys.AI_CREATOR_OPENAI,
"mvc.command.name=/ai_creator_openai/get_generations"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/SaveCompanyConfigurationMVCActionCommand.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/SaveCompanyConfigurationMVCActionCommand.java
index 31f7ca612b8699..2dccc64f7e8da5 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/SaveCompanyConfigurationMVCActionCommand.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/SaveCompanyConfigurationMVCActionCommand.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import javax.portlet.PortletException;
+import jakarta.portlet.PortletException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/instance_settings/save_company_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/SaveGroupConfigurationMVCActionCommand.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/SaveGroupConfigurationMVCActionCommand.java
index 409eb17debc7b9..64bafcf1903567 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/SaveGroupConfigurationMVCActionCommand.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/SaveGroupConfigurationMVCActionCommand.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.service.permission.GroupPermissionUtil;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import javax.portlet.PortletException;
+import jakarta.portlet.PortletException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.SITE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.SITE_SETTINGS,
"mvc.command.name=/site_settings/save_group_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/UploadGenerationsMVCActionCommand.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/UploadGenerationsMVCActionCommand.java
index b90cf48ec21ae4..552522e07efa94 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/UploadGenerationsMVCActionCommand.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/portlet/action/UploadGenerationsMVCActionCommand.java
@@ -13,10 +13,10 @@
import com.liferay.upload.UploadHandler;
import com.liferay.upload.UploadResponseHandler;
-import java.util.Map;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AICreatorOpenAIPortletKeys.AI_CREATOR_OPENAI,
+ "jakarta.portlet.name=" + AICreatorOpenAIPortletKeys.AI_CREATOR_OPENAI,
"mvc.command.name=/ai_creator_openai/upload_generations"
},
service = MVCActionCommand.class
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/upload/AICreatorOpenAIUploadFileEntryHandler.java b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/upload/AICreatorOpenAIUploadFileEntryHandler.java
index 34de2d5bd07c49..0a6f844f538865 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/upload/AICreatorOpenAIUploadFileEntryHandler.java
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/java/com/liferay/ai/creator/openai/web/internal/upload/AICreatorOpenAIUploadFileEntryHandler.java
@@ -21,6 +21,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.upload.UploadFileEntryHandler;
+import jakarta.portlet.PortletRequest;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
@@ -33,8 +35,6 @@
import java.util.Iterator;
import java.util.Set;
-import javax.portlet.PortletRequest;
-
/**
* @author Roberto Díaz
*/
diff --git a/modules/apps/ai-creator/ai-creator-openai-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/ai-creator/ai-creator-openai-web/src/main/resources/META-INF/resources/init.jsp
index 45d2350e67afcf..fee7eb9e14add6 100644
--- a/modules/apps/ai-creator/ai-creator-openai-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/ai-creator/ai-creator-openai-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/analytics/analytics-batch-export-import-impl/build.gradle b/modules/apps/analytics/analytics-batch-export-import-impl/build.gradle
index 0d637b2576d17b..0db4dd78ece6d3 100644
--- a/modules/apps/analytics/analytics-batch-export-import-impl/build.gradle
+++ b/modules/apps/analytics/analytics-batch-export-import-impl/build.gradle
@@ -1,9 +1,9 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
compileOnly group: "org.apache.httpcomponents", name: "httpclient", version: "4.5.13"
compileOnly group: "org.apache.httpcomponents", name: "httpcore", version: "4.4.14"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-api/build.gradle b/modules/apps/analytics/analytics-dxp-entity-rest-api/build.gradle
index 3e672fdee743f8..276d42ca0f9f3a 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-api/build.gradle
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-api/build.gradle
@@ -1,13 +1,13 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.github.graphql-java", name: "graphql-java-annotations", version: "9.1"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:analytics:analytics-message-storage-api")
compileOnly project(":apps:portal-odata:portal-odata-api")
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AnalyticsMostViewedContentRecommendation.java b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AnalyticsMostViewedContentRecommendation.java
index 18ce3b0919194a..8519a1df29de07 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AnalyticsMostViewedContentRecommendation.java
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AnalyticsMostViewedContentRecommendation.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,12 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Marcos Martins, Rachael Koestartyo, Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AnalyticsUserContentRecommendation.java b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AnalyticsUserContentRecommendation.java
index bdbde3e3285233..0a2902b76f804f 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AnalyticsUserContentRecommendation.java
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AnalyticsUserContentRecommendation.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,12 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Marcos Martins, Rachael Koestartyo, Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AssetEntity.java b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AssetEntity.java
index 5925f8136f45df..20a133c94664ce 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AssetEntity.java
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/AssetEntity.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,10 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Marcos Martins, Rachael Koestartyo, Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/DXPEntity.java b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/DXPEntity.java
index 05604c426f8a73..cad1cd26e22264 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/DXPEntity.java
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/DXPEntity.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,12 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Marcos Martins, Rachael Koestartyo, Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/ExpandoField.java b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/ExpandoField.java
index 20e558cc9f66d1..40553227162655 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/ExpandoField.java
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/ExpandoField.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Marcos Martins, Rachael Koestartyo, Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/Field.java b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/Field.java
index f14e206a13ebe8..1f5fbbb5eabffb 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/Field.java
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/java/com/liferay/analytics/dxp/entity/rest/dto/v1_0/Field.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Marcos Martins, Rachael Koestartyo, Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/resources/com/liferay/analytics/dxp/entity/rest/dto/v1_0/packageinfo b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/resources/com/liferay/analytics/dxp/entity/rest/dto/v1_0/packageinfo
index 6ae056526c020b..f471b7deee3f0e 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/resources/com/liferay/analytics/dxp/entity/rest/dto/v1_0/packageinfo
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-api/src/main/resources/com/liferay/analytics/dxp/entity/rest/dto/v1_0/packageinfo
@@ -1 +1 @@
-version 4.1.0
\ No newline at end of file
+version 4.1.1
\ No newline at end of file
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-impl/build.gradle b/modules/apps/analytics/analytics-dxp-entity-rest-impl/build.gradle
index 2d2ed056060d63..1420a410ddd094 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-impl/build.gradle
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-impl/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/analytics/analytics-dxp-entity-rest-impl/src/main/java/com/liferay/analytics/dxp/entity/rest/internal/resource/v1_0/OpenAPIResourceImpl.java b/modules/apps/analytics/analytics-dxp-entity-rest-impl/src/main/java/com/liferay/analytics/dxp/entity/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
index d47d45c242c8b6..f985c630149076 100644
--- a/modules/apps/analytics/analytics-dxp-entity-rest-impl/src/main/java/com/liferay/analytics/dxp/entity/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
+++ b/modules/apps/analytics/analytics-dxp-entity-rest-impl/src/main/java/com/liferay/analytics/dxp/entity/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
@@ -11,23 +11,23 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.info.License;
-import java.lang.reflect.Method;
+import jakarta.annotation.Generated;
-import java.util.HashSet;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.annotation.Generated;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.HashSet;
+import java.util.Set;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-layout-page-template-web/build.gradle b/modules/apps/analytics/analytics-layout-page-template-web/build.gradle
index cbbc1465aa6271..b353937eee5e06 100644
--- a/modules/apps/analytics/analytics-layout-page-template-web/build.gradle
+++ b/modules/apps/analytics/analytics-layout-page-template-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:analytics:analytics-settings-rest-api")
diff --git a/modules/apps/analytics/analytics-layout-page-template-web/src/main/java/com/liferay/analytics/layout/page/template/web/internal/servlet/taglib/AnalyticsRenderFragmentLayoutPostDynamicInclude.java b/modules/apps/analytics/analytics-layout-page-template-web/src/main/java/com/liferay/analytics/layout/page/template/web/internal/servlet/taglib/AnalyticsRenderFragmentLayoutPostDynamicInclude.java
index 70482fd167f728..8ad9b0e85d4c8a 100644
--- a/modules/apps/analytics/analytics-layout-page-template-web/src/main/java/com/liferay/analytics/layout/page/template/web/internal/servlet/taglib/AnalyticsRenderFragmentLayoutPostDynamicInclude.java
+++ b/modules/apps/analytics/analytics-layout-page-template-web/src/main/java/com/liferay/analytics/layout/page/template/web/internal/servlet/taglib/AnalyticsRenderFragmentLayoutPostDynamicInclude.java
@@ -19,18 +19,18 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.taglib.aui.ScriptTag;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Writer;
import java.util.Locale;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-layout-page-template-web/src/main/java/com/liferay/analytics/layout/page/template/web/internal/servlet/taglib/AnalyticsRenderFragmentLayoutPreDynamicInclude.java b/modules/apps/analytics/analytics-layout-page-template-web/src/main/java/com/liferay/analytics/layout/page/template/web/internal/servlet/taglib/AnalyticsRenderFragmentLayoutPreDynamicInclude.java
index f2f58ecd0721ea..979b24ace8179a 100644
--- a/modules/apps/analytics/analytics-layout-page-template-web/src/main/java/com/liferay/analytics/layout/page/template/web/internal/servlet/taglib/AnalyticsRenderFragmentLayoutPreDynamicInclude.java
+++ b/modules/apps/analytics/analytics-layout-page-template-web/src/main/java/com/liferay/analytics/layout/page/template/web/internal/servlet/taglib/AnalyticsRenderFragmentLayoutPreDynamicInclude.java
@@ -18,6 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.TreeMapBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
@@ -26,9 +29,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-machine-learning-impl/build.gradle b/modules/apps/analytics/analytics-machine-learning-impl/build.gradle
index 7539b56e34250f..62688bbe26244c 100644
--- a/modules/apps/analytics/analytics-machine-learning-impl/build.gradle
+++ b/modules/apps/analytics/analytics-machine-learning-impl/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.apache.httpcomponents", name: "httpclient", version: "4.5.13"
compileOnly group: "org.apache.httpcomponents", name: "httpcore", version: "4.4.14"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
diff --git a/modules/apps/analytics/analytics-machine-learning-impl/src/main/java/com/liferay/analytics/machine/learning/internal/recommendation/notifications/RecommendationNotificationHandler.java b/modules/apps/analytics/analytics-machine-learning-impl/src/main/java/com/liferay/analytics/machine/learning/internal/recommendation/notifications/RecommendationNotificationHandler.java
index f52e5987a40827..e7485269bc38cb 100644
--- a/modules/apps/analytics/analytics-machine-learning-impl/src/main/java/com/liferay/analytics/machine/learning/internal/recommendation/notifications/RecommendationNotificationHandler.java
+++ b/modules/apps/analytics/analytics-machine-learning-impl/src/main/java/com/liferay/analytics/machine/learning/internal/recommendation/notifications/RecommendationNotificationHandler.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.util.PortletKeys;
import com.liferay.portal.kernel.util.StringUtil;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import java.util.Locale;
import org.apache.http.client.utils.URIBuilder;
@@ -32,7 +32,7 @@
* @author Marcos Martins
*/
@Component(
- property = "javax.portlet.name=" + PortletKeys.RECOMMENDATIONS,
+ property = "jakarta.portlet.name=" + PortletKeys.RECOMMENDATIONS,
service = UserNotificationHandler.class
)
public class RecommendationNotificationHandler
diff --git a/modules/apps/analytics/analytics-machine-learning-impl/src/test/java/com/liferay/analytics/machine/learning/internal/recommendation/notifications/RecommendationNotificationHandlerTest.java b/modules/apps/analytics/analytics-machine-learning-impl/src/test/java/com/liferay/analytics/machine/learning/internal/recommendation/notifications/RecommendationNotificationHandlerTest.java
index 31895f88e54599..f82a06e2a0cdd2 100644
--- a/modules/apps/analytics/analytics-machine-learning-impl/src/test/java/com/liferay/analytics/machine/learning/internal/recommendation/notifications/RecommendationNotificationHandlerTest.java
+++ b/modules/apps/analytics/analytics-machine-learning-impl/src/test/java/com/liferay/analytics/machine/learning/internal/recommendation/notifications/RecommendationNotificationHandlerTest.java
@@ -18,7 +18,7 @@
import com.liferay.portal.model.impl.UserNotificationEventImpl;
import com.liferay.portal.test.rule.LiferayUnitTestRule;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-impl/build.gradle b/modules/apps/analytics/analytics-settings-impl/build.gradle
index a7304274636e77..cd779636b0bc6b 100644
--- a/modules/apps/analytics/analytics-settings-impl/build.gradle
+++ b/modules/apps/analytics/analytics-settings-impl/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/analytics/analytics-settings-impl/src/main/java/com/liferay/analytics/settings/internal/security/auth/verifier/AnalyticsSecurityAuthVerifier.java b/modules/apps/analytics/analytics-settings-impl/src/main/java/com/liferay/analytics/settings/internal/security/auth/verifier/AnalyticsSecurityAuthVerifier.java
index 41844f0a86dc8a..47b03d17709847 100644
--- a/modules/apps/analytics/analytics-settings-impl/src/main/java/com/liferay/analytics/settings/internal/security/auth/verifier/AnalyticsSecurityAuthVerifier.java
+++ b/modules/apps/analytics/analytics-settings-impl/src/main/java/com/liferay/analytics/settings/internal/security/auth/verifier/AnalyticsSecurityAuthVerifier.java
@@ -24,6 +24,8 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.nio.charset.Charset;
import java.security.KeyFactory;
@@ -37,8 +39,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-api/bnd.bnd b/modules/apps/analytics/analytics-settings-rest-api/bnd.bnd
index f8d4592daa3091..079aa72a235a81 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/bnd.bnd
+++ b/modules/apps/analytics/analytics-settings-rest-api/bnd.bnd
@@ -1,6 +1,6 @@
Bundle-Name: Liferay Analytics Settings REST API
Bundle-SymbolicName: com.liferay.analytics.settings.rest.api
-Bundle-Version: 6.0.2
+Bundle-Version: 7.0.0
Export-Package:\
com.liferay.analytics.settings.rest.constants,\
com.liferay.analytics.settings.rest.dto.v1_0,\
diff --git a/modules/apps/analytics/analytics-settings-rest-api/build.gradle b/modules/apps/analytics/analytics-settings-rest-api/build.gradle
index edb10429c50d8b..14acb8b054c56c 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/build.gradle
+++ b/modules/apps/analytics/analytics-settings-rest-api/build.gradle
@@ -1,13 +1,13 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.github.graphql-java", name: "graphql-java-annotations", version: "9.1"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:analytics:analytics-settings-api")
compileOnly project(":apps:portal-odata:portal-odata-api")
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Channel.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Channel.java
index 758b2a37c87a98..3367509ad1bcd7 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Channel.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Channel.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Size;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,13 +35,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.Size;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/CommerceChannel.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/CommerceChannel.java
index d36531ca7f6aca..1e1770a86161e2 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/CommerceChannel.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/CommerceChannel.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactAccountGroup.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactAccountGroup.java
index 36c7b1e62314e9..80b482ec8e3ec6 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactAccountGroup.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactAccountGroup.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactConfiguration.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactConfiguration.java
index b425a04824b74a..a4fba0a27534c2 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactConfiguration.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactConfiguration.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactOrganization.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactOrganization.java
index 67037647c3552d..fbdea31d79f4ab 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactOrganization.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactOrganization.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactUserGroup.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactUserGroup.java
index 48df0c364025dc..77ea984fd41778 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactUserGroup.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/ContactUserGroup.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/DataSource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/DataSource.java
index 2ffd90abbcd1d1..a7e79bcc294921 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/DataSource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/DataSource.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/DataSourceToken.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/DataSourceToken.java
index 71e03ddd627feb..ccb1bbad221e46 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/DataSourceToken.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/DataSourceToken.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Field.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Field.java
index 41b0237bd5691d..d2501ab65ba919 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Field.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Field.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/FieldSummary.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/FieldSummary.java
index d7aef3a42fab41..c3835adccbc15b 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/FieldSummary.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/FieldSummary.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/RecommendationConfiguration.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/RecommendationConfiguration.java
index 53993948178385..49d8605163f4ea 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/RecommendationConfiguration.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/RecommendationConfiguration.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/RecommendationItem.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/RecommendationItem.java
index 4fa0f312ac4dfa..3ba18daf2a7228 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/RecommendationItem.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/RecommendationItem.java
@@ -19,6 +19,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -27,12 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Site.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Site.java
index 5d9de99c4daad6..36a76c9c1a19f4 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Site.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/dto/v1_0/Site.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/AnalyticsDXPEntityBatchExporterResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/AnalyticsDXPEntityBatchExporterResource.java
index bd11c774a69f27..e0f672a228c799 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/AnalyticsDXPEntityBatchExporterResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/AnalyticsDXPEntityBatchExporterResource.java
@@ -14,18 +14,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ChannelResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ChannelResource.java
index d3345be9fb7359..6d18a672b36bc0 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ChannelResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ChannelResource.java
@@ -17,18 +17,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/CommerceChannelResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/CommerceChannelResource.java
index ebcad6a2d41d6a..d12128f29e0250 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/CommerceChannelResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/CommerceChannelResource.java
@@ -17,18 +17,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactAccountGroupResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactAccountGroupResource.java
index 680deea1cc77f4..4012a01f16d95d 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactAccountGroupResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactAccountGroupResource.java
@@ -17,18 +17,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactConfigurationResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactConfigurationResource.java
index 4115b5a21ae3e4..2d4d567cb2dd4b 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactConfigurationResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactConfigurationResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactOrganizationResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactOrganizationResource.java
index 6db1316514b35c..33d87df25ecc95 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactOrganizationResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactOrganizationResource.java
@@ -17,18 +17,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactUserGroupResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactUserGroupResource.java
index e6ea851124e288..909131e2499bbc 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactUserGroupResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/ContactUserGroupResource.java
@@ -17,18 +17,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/DataSourceResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/DataSourceResource.java
index d23ecf3eb3686f..7b606794456384 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/DataSourceResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/DataSourceResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/FieldResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/FieldResource.java
index 9777143b019366..3dbd9367028d4a 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/FieldResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/FieldResource.java
@@ -17,18 +17,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/FieldSummaryResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/FieldSummaryResource.java
index 96892a2a058dcb..dac47b73e75e83 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/FieldSummaryResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/FieldSummaryResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/RecommendationConfigurationResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/RecommendationConfigurationResource.java
index 32211be14aa137..62eddf1894e647 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/RecommendationConfigurationResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/RecommendationConfigurationResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/SiteResource.java b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/SiteResource.java
index 195fc4df04cb7a..e292133c3141d4 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/SiteResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/java/com/liferay/analytics/settings/rest/resource/v1_0/SiteResource.java
@@ -17,18 +17,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/resources/com/liferay/analytics/settings/rest/dto/v1_0/packageinfo b/modules/apps/analytics/analytics-settings-rest-api/src/main/resources/com/liferay/analytics/settings/rest/dto/v1_0/packageinfo
index 682b435622a0aa..61bfc73502f0f2 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/resources/com/liferay/analytics/settings/rest/dto/v1_0/packageinfo
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/resources/com/liferay/analytics/settings/rest/dto/v1_0/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/modules/apps/analytics/analytics-settings-rest-api/src/main/resources/com/liferay/analytics/settings/rest/resource/v1_0/packageinfo b/modules/apps/analytics/analytics-settings-rest-api/src/main/resources/com/liferay/analytics/settings/rest/resource/v1_0/packageinfo
index 5d87717ebffb0c..dde115d61ba0bb 100644
--- a/modules/apps/analytics/analytics-settings-rest-api/src/main/resources/com/liferay/analytics/settings/rest/resource/v1_0/packageinfo
+++ b/modules/apps/analytics/analytics-settings-rest-api/src/main/resources/com/liferay/analytics/settings/rest/resource/v1_0/packageinfo
@@ -1 +1 @@
-version 4.2.0
\ No newline at end of file
+version 5.0.0
\ No newline at end of file
diff --git a/modules/apps/analytics/analytics-settings-rest-client/build.gradle b/modules/apps/analytics/analytics-settings-rest-client/build.gradle
index b802e77531117e..1c5c01ff57416f 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/build.gradle
+++ b/modules/apps/analytics/analytics-settings-rest-client/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
}
\ No newline at end of file
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/aggregation/Aggregation.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/aggregation/Aggregation.java
index 1ee3a2bb4f0af2..89da44ecf372a5 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/aggregation/Aggregation.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/aggregation/Aggregation.java
@@ -5,11 +5,11 @@
package com.liferay.analytics.settings.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/aggregation/Facet.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/aggregation/Facet.java
index 4963d55e4e1ad1..3dd76fba12ec1e 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/aggregation/Facet.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/aggregation/Facet.java
@@ -5,11 +5,11 @@
package com.liferay.analytics.settings.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Channel.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Channel.java
index 87e86c43b82e17..ada02237c7e8e0 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Channel.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Channel.java
@@ -8,13 +8,13 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/CommerceChannel.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/CommerceChannel.java
index bebffab03629c7..ef69c1de01f8aa 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/CommerceChannel.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/CommerceChannel.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.CommerceChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactAccountGroup.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactAccountGroup.java
index eeb0cfa6f3263a..cd500bc7c14fc7 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactAccountGroup.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactAccountGroup.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ContactAccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactConfiguration.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactConfiguration.java
index b74182e1a7a9d4..53ccb2c088da9e 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactConfiguration.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactConfiguration.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ContactConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactOrganization.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactOrganization.java
index 3f18f606d461a7..a6db4eb4dd2ac7 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactOrganization.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactOrganization.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ContactOrganizationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactUserGroup.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactUserGroup.java
index 326c09149f57cf..a0d8902985e8f3 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactUserGroup.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/ContactUserGroup.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ContactUserGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/DataSource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/DataSource.java
index e6fd6e44544a04..c9d9692ff95a3b 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/DataSource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/DataSource.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.DataSourceSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/DataSourceToken.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/DataSourceToken.java
index 1918e95e27ba03..9b3fcf5140d133 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/DataSourceToken.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/DataSourceToken.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.DataSourceTokenSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Field.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Field.java
index aec990cb0794a4..a1674e8b9b318d 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Field.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Field.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.FieldSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/FieldSummary.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/FieldSummary.java
index 82302f8fd71a88..e9550cb43ab336 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/FieldSummary.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/FieldSummary.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.FieldSummarySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/RecommendationConfiguration.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/RecommendationConfiguration.java
index 2b0b31cde9b6a8..b8a0945ddfe06e 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/RecommendationConfiguration.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/RecommendationConfiguration.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.RecommendationConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/RecommendationItem.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/RecommendationItem.java
index 5187a53e1e0a74..98209f1bb3772a 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/RecommendationItem.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/RecommendationItem.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.RecommendationItemSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Site.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Site.java
index 175e8fab0ca363..4166380f0a6fee 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Site.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/dto/v1_0/Site.java
@@ -8,12 +8,12 @@
import com.liferay.analytics.settings.rest.client.function.UnsafeSupplier;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.SiteSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/function/UnsafeSupplier.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/function/UnsafeSupplier.java
index f0e74989660b5b..22c93681b2d483 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/function/UnsafeSupplier.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/function/UnsafeSupplier.java
@@ -5,7 +5,7 @@
package com.liferay.analytics.settings.rest.client.function;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Riccardo Ferrari
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/http/HttpInvoker.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/http/HttpInvoker.java
index 5673ed8b15e82f..03e54437545a53 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/http/HttpInvoker.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/http/HttpInvoker.java
@@ -5,6 +5,8 @@
package com.liferay.analytics.settings.rest.client.http;
+import jakarta.annotation.Generated;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -29,8 +31,6 @@
import java.util.Set;
import java.util.regex.Matcher;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/json/BaseJSONParser.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/json/BaseJSONParser.java
index 59d8e9e14b870b..c9ad543accd5f1 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/json/BaseJSONParser.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/json/BaseJSONParser.java
@@ -5,6 +5,8 @@
package com.liferay.analytics.settings.rest.client.json;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -18,8 +20,6 @@
import java.util.Stack;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/pagination/Page.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/pagination/Page.java
index fdd53340c0cdf2..6f2f7676f522b1 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/pagination/Page.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/pagination/Page.java
@@ -8,6 +8,8 @@
import com.liferay.analytics.settings.rest.client.aggregation.Facet;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/pagination/Pagination.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/pagination/Pagination.java
index c29b7ce673d29b..02028370189d43 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/pagination/Pagination.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/pagination/Pagination.java
@@ -5,7 +5,7 @@
package com.liferay.analytics.settings.rest.client.pagination;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Riccardo Ferrari
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/permission/Permission.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/permission/Permission.java
index d4c467dc193d84..e21c283a2bb203 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/permission/Permission.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/permission/Permission.java
@@ -7,9 +7,9 @@
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Riccardo Ferrari
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/problem/Problem.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/problem/Problem.java
index 2a1e103f4d799c..713df07ddaf1cc 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/problem/Problem.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/problem/Problem.java
@@ -7,9 +7,9 @@
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Riccardo Ferrari
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/AnalyticsDXPEntityBatchExporterResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/AnalyticsDXPEntityBatchExporterResource.java
index 922a6ccace81c0..0f5d6bb6ee9003 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/AnalyticsDXPEntityBatchExporterResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/AnalyticsDXPEntityBatchExporterResource.java
@@ -8,6 +8,8 @@
import com.liferay.analytics.settings.rest.client.http.HttpInvoker;
import com.liferay.analytics.settings.rest.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -17,8 +19,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ChannelResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ChannelResource.java
index 395a68eecedc34..936a96a8dd62de 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ChannelResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ChannelResource.java
@@ -12,6 +12,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/CommerceChannelResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/CommerceChannelResource.java
index b47d8e40379b6e..c07bffc40857e4 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/CommerceChannelResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/CommerceChannelResource.java
@@ -12,6 +12,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.CommerceChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactAccountGroupResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactAccountGroupResource.java
index a69b2f924c7431..983fe85761bd6f 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactAccountGroupResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactAccountGroupResource.java
@@ -12,6 +12,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ContactAccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactConfigurationResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactConfigurationResource.java
index 87bd0b4e3e9149..e497b49e55648b 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactConfigurationResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactConfigurationResource.java
@@ -10,6 +10,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ContactConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -19,8 +21,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactOrganizationResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactOrganizationResource.java
index 5eb28f54759781..f9cbe59d369536 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactOrganizationResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactOrganizationResource.java
@@ -12,6 +12,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ContactOrganizationSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactUserGroupResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactUserGroupResource.java
index d370d1e5815008..507bb254e33902 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactUserGroupResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/ContactUserGroupResource.java
@@ -12,6 +12,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.ContactUserGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/DataSourceResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/DataSourceResource.java
index 34ef5f67e57756..dba061a6d8a2be 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/DataSourceResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/DataSourceResource.java
@@ -9,6 +9,8 @@
import com.liferay.analytics.settings.rest.client.http.HttpInvoker;
import com.liferay.analytics.settings.rest.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/FieldResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/FieldResource.java
index 4c153c521598ec..151339a9f92824 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/FieldResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/FieldResource.java
@@ -12,6 +12,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.FieldSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.ArrayList;
@@ -23,8 +25,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/FieldSummaryResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/FieldSummaryResource.java
index eae0823ad82be4..1350610bdbd37c 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/FieldSummaryResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/FieldSummaryResource.java
@@ -10,6 +10,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.FieldSummarySerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -19,8 +21,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/RecommendationConfigurationResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/RecommendationConfigurationResource.java
index abdc861649e22d..d11ee79464d15f 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/RecommendationConfigurationResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/RecommendationConfigurationResource.java
@@ -10,6 +10,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.RecommendationConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -19,8 +21,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/SiteResource.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/SiteResource.java
index ac339e2afa8342..cd07bcb00629c3 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/SiteResource.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/resource/v1_0/SiteResource.java
@@ -12,6 +12,8 @@
import com.liferay.analytics.settings.rest.client.problem.Problem;
import com.liferay.analytics.settings.rest.client.serdes.v1_0.SiteSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ChannelSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ChannelSerDes.java
index e401bfbbbe782b..0a1e91a6e34f75 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ChannelSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ChannelSerDes.java
@@ -9,6 +9,8 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.DataSource;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -18,8 +20,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/CommerceChannelSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/CommerceChannelSerDes.java
index 7157f347defd1f..16f81300538f37 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/CommerceChannelSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/CommerceChannelSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.CommerceChannel;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactAccountGroupSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactAccountGroupSerDes.java
index 59ef22aa36bc14..d37be22f62126c 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactAccountGroupSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactAccountGroupSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.ContactAccountGroup;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactConfigurationSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactConfigurationSerDes.java
index 7318240aed9b06..5be8964c57a0c5 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactConfigurationSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactConfigurationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.ContactConfiguration;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactOrganizationSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactOrganizationSerDes.java
index 7d2d661cc9aa84..8249037f377baa 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactOrganizationSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactOrganizationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.ContactOrganization;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactUserGroupSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactUserGroupSerDes.java
index 813233b220aa2b..e03ba023bbabb6 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactUserGroupSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/ContactUserGroupSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.ContactUserGroup;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/DataSourceSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/DataSourceSerDes.java
index e9f0da9f80bfe3..a27f61d3858e49 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/DataSourceSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/DataSourceSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.DataSource;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/DataSourceTokenSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/DataSourceTokenSerDes.java
index d9a46159919d60..47d1e6c7ac16a0 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/DataSourceTokenSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/DataSourceTokenSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.DataSourceToken;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/FieldSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/FieldSerDes.java
index 010fbbf887f4ff..50e9602099a371 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/FieldSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/FieldSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.Field;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/FieldSummarySerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/FieldSummarySerDes.java
index fd2e4b943e9469..83ebbd23d9a7e2 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/FieldSummarySerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/FieldSummarySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.FieldSummary;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/RecommendationConfigurationSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/RecommendationConfigurationSerDes.java
index 24d20fd8702649..6989e82f6ede57 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/RecommendationConfigurationSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/RecommendationConfigurationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.RecommendationConfiguration;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/RecommendationItemSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/RecommendationItemSerDes.java
index 702dbad9e6020a..f0c10c6edf0d1c 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/RecommendationItemSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/RecommendationItemSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.RecommendationItem;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/SiteSerDes.java b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/SiteSerDes.java
index 609894e719ad82..b83d14dfa36476 100644
--- a/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/SiteSerDes.java
+++ b/modules/apps/analytics/analytics-settings-rest-client/src/main/java/com/liferay/analytics/settings/rest/client/serdes/v1_0/SiteSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.analytics.settings.rest.client.dto.v1_0.Site;
import com.liferay.analytics.settings.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Riccardo Ferrari
* @generated
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/build.gradle b/modules/apps/analytics/analytics-settings-rest-impl/build.gradle
index eb1ef65e860543..936a76c945c358 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/build.gradle
+++ b/modules/apps/analytics/analytics-settings-rest-impl/build.gradle
@@ -3,13 +3,13 @@ dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/mutation/v1_0/Mutation.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/mutation/v1_0/Mutation.java
index 91f2209100c697..2eb3bc2d8168f5 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/mutation/v1_0/Mutation.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/mutation/v1_0/Mutation.java
@@ -23,14 +23,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLField;
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/query/v1_0/Query.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/query/v1_0/Query.java
index a31ce30553063e..5911420f7a2000 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/query/v1_0/Query.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/query/v1_0/Query.java
@@ -35,15 +35,15 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
-import java.util.Map;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
index 5b8a08aa9a0d05..2cd96e366ab78f 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.util.ObjectValuePair;
import com.liferay.portal.vulcan.graphql.servlet.ServletData;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/jaxrs/application/AnalyticsSettingsRESTApplication.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/jaxrs/application/AnalyticsSettingsRESTApplication.java
index bfaf06e103864e..c563a5716ce968 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/jaxrs/application/AnalyticsSettingsRESTApplication.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/jaxrs/application/AnalyticsSettingsRESTApplication.java
@@ -5,9 +5,9 @@
package com.liferay.analytics.settings.rest.internal.jaxrs.application;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.core.Application;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseAnalyticsDXPEntityBatchExporterResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseAnalyticsDXPEntityBatchExporterResourceImpl.java
index 33d284dcbe746e..ecdf7ba43eda7c 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseAnalyticsDXPEntityBatchExporterResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseAnalyticsDXPEntityBatchExporterResourceImpl.java
@@ -21,23 +21,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAnalyticsDXPEntityBatchExporterResourceImpl
implements AnalyticsDXPEntityBatchExporterResource {
@@ -53,9 +53,9 @@ public abstract class BaseAnalyticsDXPEntityBatchExporterResourceImpl
)
}
)
- @javax.ws.rs.Path("/configuration/wizard-mode")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/configuration/wizard-mode")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postConfigurationWizardMode() throws Exception {
}
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseChannelResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseChannelResourceImpl.java
index fec1e867b827f4..a03bc121a33025 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseChannelResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseChannelResourceImpl.java
@@ -24,24 +24,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseChannelResourceImpl implements ChannelResource {
/**
@@ -72,16 +72,16 @@ public abstract class BaseChannelResourceImpl implements ChannelResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Channel")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/channels")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/channels")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getChannelsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keywords")
+ @jakarta.ws.rs.QueryParam("keywords")
String keywords,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -96,10 +96,10 @@ public Page getChannelsPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Channel")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/channels")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/channels")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Channel patchChannel(Channel channel) throws Exception {
return new Channel();
@@ -113,10 +113,10 @@ public Channel patchChannel(Channel channel) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Channel")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/channels")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/channels")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Channel postChannel(Channel channel) throws Exception {
return new Channel();
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseCommerceChannelResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseCommerceChannelResourceImpl.java
index 827f782f158ea4..d69281fa0bcb02 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseCommerceChannelResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseCommerceChannelResourceImpl.java
@@ -24,24 +24,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCommerceChannelResourceImpl
implements CommerceChannelResource {
@@ -75,16 +75,16 @@ public abstract class BaseCommerceChannelResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "CommerceChannel")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/commerce-channels")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/commerce-channels")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getCommerceChannelsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keywords")
+ @jakarta.ws.rs.QueryParam("keywords")
String keywords,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactAccountGroupResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactAccountGroupResourceImpl.java
index 9e410f94de9fed..e7cb2233af4aed 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactAccountGroupResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactAccountGroupResourceImpl.java
@@ -24,24 +24,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseContactAccountGroupResourceImpl
implements ContactAccountGroupResource {
@@ -77,16 +77,16 @@ public abstract class BaseContactAccountGroupResourceImpl
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/contacts/account-groups")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/contacts/account-groups")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getContactAccountGroupsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keywords")
+ @jakarta.ws.rs.QueryParam("keywords")
String keywords,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactConfigurationResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactConfigurationResourceImpl.java
index 51dd259d701828..aacfe48f43fe96 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactConfigurationResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactConfigurationResourceImpl.java
@@ -22,23 +22,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseContactConfigurationResourceImpl
implements ContactConfigurationResource {
@@ -54,9 +54,9 @@ public abstract class BaseContactConfigurationResourceImpl
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/contacts/configuration")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/contacts/configuration")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public ContactConfiguration getContactConfiguration() throws Exception {
return new ContactConfiguration();
@@ -74,10 +74,10 @@ public ContactConfiguration getContactConfiguration() throws Exception {
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/contacts/configuration")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/contacts/configuration")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public void putContactConfiguration(
ContactConfiguration contactConfiguration)
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactOrganizationResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactOrganizationResourceImpl.java
index 5fc139c3001c49..c905aa404e3cd0 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactOrganizationResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactOrganizationResourceImpl.java
@@ -24,24 +24,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseContactOrganizationResourceImpl
implements ContactOrganizationResource {
@@ -77,16 +77,16 @@ public abstract class BaseContactOrganizationResourceImpl
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/contacts/organizations")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/contacts/organizations")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getContactOrganizationsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keywords")
+ @jakarta.ws.rs.QueryParam("keywords")
String keywords,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactUserGroupResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactUserGroupResourceImpl.java
index 672e3a83e6da88..85fe1f025a6aa3 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactUserGroupResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseContactUserGroupResourceImpl.java
@@ -24,24 +24,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseContactUserGroupResourceImpl
implements ContactUserGroupResource {
@@ -75,16 +75,16 @@ public abstract class BaseContactUserGroupResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "ContactUserGroup")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/contacts/user-groups")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/contacts/user-groups")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getContactUserGroupsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keywords")
+ @jakarta.ws.rs.QueryParam("keywords")
String keywords,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseDataSourceResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseDataSourceResourceImpl.java
index 153b1cc632cf24..fa30a2a0528200 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseDataSourceResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseDataSourceResourceImpl.java
@@ -22,23 +22,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseDataSourceResourceImpl implements DataSourceResource {
/**
@@ -49,9 +49,9 @@ public abstract class BaseDataSourceResourceImpl implements DataSourceResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "DataSource")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/data-sources")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/data-sources")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteDataSource() throws Exception {
}
@@ -64,10 +64,10 @@ public void deleteDataSource() throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "DataSource")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/data-sources")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/data-sources")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postDataSource(DataSourceToken dataSourceToken)
throws Exception {
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseFieldResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseFieldResourceImpl.java
index 6db4c763ed3b30..eb5fb3e0626c22 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseFieldResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseFieldResourceImpl.java
@@ -24,24 +24,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseFieldResourceImpl implements FieldResource {
/**
@@ -72,16 +72,16 @@ public abstract class BaseFieldResourceImpl implements FieldResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/fields/accounts")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/fields/accounts")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getFieldsAccountsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keyword")
+ @jakarta.ws.rs.QueryParam("keyword")
String keyword,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -96,10 +96,10 @@ public Page getFieldsAccountsPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/fields/accounts")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/fields/accounts")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void patchFieldAccount(Field[] fields) throws Exception {
}
@@ -132,16 +132,16 @@ public void patchFieldAccount(Field[] fields) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/fields/orders")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/fields/orders")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getFieldsOrdersPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keyword")
+ @jakarta.ws.rs.QueryParam("keyword")
String keyword,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -156,10 +156,10 @@ public Page getFieldsOrdersPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/fields/orders")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/fields/orders")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void patchFieldOrder(Field[] fields) throws Exception {
}
@@ -192,16 +192,16 @@ public void patchFieldOrder(Field[] fields) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/fields/people")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/fields/people")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getFieldsPeoplePage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keyword")
+ @jakarta.ws.rs.QueryParam("keyword")
String keyword,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -216,10 +216,10 @@ public Page getFieldsPeoplePage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/fields/people")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/fields/people")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void patchFieldPeople(Field[] fields) throws Exception {
}
@@ -252,16 +252,16 @@ public void patchFieldPeople(Field[] fields) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/fields/products")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/fields/products")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getFieldsProductsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keyword")
+ @jakarta.ws.rs.QueryParam("keyword")
String keyword,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -276,10 +276,10 @@ public Page getFieldsProductsPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/fields/products")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/fields/products")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void patchFieldProduct(Field[] fields) throws Exception {
}
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseFieldSummaryResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseFieldSummaryResourceImpl.java
index dd4cfab3a864bc..61ee658ad1aaa9 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseFieldSummaryResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseFieldSummaryResourceImpl.java
@@ -22,23 +22,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseFieldSummaryResourceImpl
implements FieldSummaryResource {
@@ -50,9 +50,9 @@ public abstract class BaseFieldSummaryResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "FieldSummary")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/fields")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/fields")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public FieldSummary getField() throws Exception {
return new FieldSummary();
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseRecommendationConfigurationResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseRecommendationConfigurationResourceImpl.java
index a00a81792cb7de..259b61e3ff1325 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseRecommendationConfigurationResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseRecommendationConfigurationResourceImpl.java
@@ -22,23 +22,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseRecommendationConfigurationResourceImpl
implements RecommendationConfigurationResource {
@@ -54,9 +54,9 @@ public abstract class BaseRecommendationConfigurationResourceImpl
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/recommendation/configuration")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/recommendation/configuration")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public RecommendationConfiguration getRecommendationConfiguration()
throws Exception {
@@ -76,10 +76,10 @@ public RecommendationConfiguration getRecommendationConfiguration()
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/recommendation/configuration")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/recommendation/configuration")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public void putRecommendationConfiguration(
RecommendationConfiguration recommendationConfiguration)
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseSiteResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseSiteResourceImpl.java
index d24acf14835866..6318ed93faebd5 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseSiteResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/BaseSiteResourceImpl.java
@@ -24,24 +24,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Riccardo Ferrari
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseSiteResourceImpl implements SiteResource {
/**
@@ -72,16 +72,16 @@ public abstract class BaseSiteResourceImpl implements SiteResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Site")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/sites")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/sites")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getSitesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("keywords")
+ @jakarta.ws.rs.QueryParam("keywords")
String keywords,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/OpenAPIResourceImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
index d63e27888a099a..b8bf6ce069fda5 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
@@ -11,23 +11,23 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.info.License;
-import java.lang.reflect.Method;
+import jakarta.annotation.Generated;
-import java.util.HashSet;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.annotation.Generated;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.HashSet;
+import java.util.Set;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/AnalyticsDXPEntityBatchExporterResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/AnalyticsDXPEntityBatchExporterResourceFactoryImpl.java
index 35694bc6ac9e02..8f74ef2679b5c4 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/AnalyticsDXPEntityBatchExporterResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/AnalyticsDXPEntityBatchExporterResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ChannelResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ChannelResourceFactoryImpl.java
index a7c7360f31cfd7..bfb6398a589bba 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ChannelResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ChannelResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/CommerceChannelResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/CommerceChannelResourceFactoryImpl.java
index 738b53edad2426..e116d2d2625e98 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/CommerceChannelResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/CommerceChannelResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactAccountGroupResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactAccountGroupResourceFactoryImpl.java
index e1ea344e4bcd52..6bdc5f912a6988 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactAccountGroupResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactAccountGroupResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactConfigurationResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactConfigurationResourceFactoryImpl.java
index ef678d4b896848..9375a28e3e0342 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactConfigurationResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactConfigurationResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactOrganizationResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactOrganizationResourceFactoryImpl.java
index 161497434ea68b..d09fb025e3c11c 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactOrganizationResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactOrganizationResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactUserGroupResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactUserGroupResourceFactoryImpl.java
index 41452046bc695f..72cf842910e63b 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactUserGroupResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/ContactUserGroupResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/DataSourceResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/DataSourceResourceFactoryImpl.java
index c1fca14db24a05..9f7f068c5eab86 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/DataSourceResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/DataSourceResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/FieldResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/FieldResourceFactoryImpl.java
index 5a2e9c4466612b..b3c499c307212e 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/FieldResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/FieldResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/FieldSummaryResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/FieldSummaryResourceFactoryImpl.java
index 0832aee1b722f2..adc71e1201e975 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/FieldSummaryResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/FieldSummaryResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/RecommendationConfigurationResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/RecommendationConfigurationResourceFactoryImpl.java
index 6e64c9f032b7ce..69f5de7c874ca2 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/RecommendationConfigurationResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/RecommendationConfigurationResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/SiteResourceFactoryImpl.java b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/SiteResourceFactoryImpl.java
index 75011165843cb7..56ad2cc7d08e21 100644
--- a/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/SiteResourceFactoryImpl.java
+++ b/modules/apps/analytics/analytics-settings-rest-impl/src/main/java/com/liferay/analytics/settings/rest/internal/resource/v1_0/factory/SiteResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/build.gradle b/modules/apps/analytics/analytics-settings-rest-test/build.gradle
index 7ce27f046e34a0..756aa63857230d 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/build.gradle
+++ b/modules/apps/analytics/analytics-settings-rest-test/build.gradle
@@ -2,10 +2,10 @@ dependencies {
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
+ testIntegrationImplementation group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.test", version: "default"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.test.integration", version: "default"
- testIntegrationImplementation group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
+ testIntegrationImplementation group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
testIntegrationImplementation project(":apps:analytics:analytics-settings-api")
testIntegrationImplementation project(":apps:analytics:analytics-settings-rest-api")
testIntegrationImplementation project(":apps:analytics:analytics-settings-rest-client")
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseAnalyticsDXPEntityBatchExporterResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseAnalyticsDXPEntityBatchExporterResourceTestCase.java
index 2af72109ec60b1..85452c665b5ae4 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseAnalyticsDXPEntityBatchExporterResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseAnalyticsDXPEntityBatchExporterResourceTestCase.java
@@ -30,6 +30,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -45,10 +49,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseChannelResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseChannelResourceTestCase.java
index 9dac8a417b54af..9315bc21e43a58 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseChannelResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseChannelResourceTestCase.java
@@ -45,6 +45,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -60,10 +64,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseCommerceChannelResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseCommerceChannelResourceTestCase.java
index 320640da9c115e..d850c8a05e9598 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseCommerceChannelResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseCommerceChannelResourceTestCase.java
@@ -45,6 +45,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -60,10 +64,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactAccountGroupResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactAccountGroupResourceTestCase.java
index 0fffc093bdd0e2..6420afa87ba894 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactAccountGroupResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactAccountGroupResourceTestCase.java
@@ -45,6 +45,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -60,10 +64,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactConfigurationResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactConfigurationResourceTestCase.java
index 92937da9c1d9e9..ee3e37f1802c1b 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactConfigurationResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactConfigurationResourceTestCase.java
@@ -41,6 +41,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -56,10 +60,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactOrganizationResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactOrganizationResourceTestCase.java
index 445a703856b490..d5d9781285ffc1 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactOrganizationResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactOrganizationResourceTestCase.java
@@ -45,6 +45,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -60,10 +64,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactUserGroupResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactUserGroupResourceTestCase.java
index 5e6bb14703a6f5..bc2e358a7707d6 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactUserGroupResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseContactUserGroupResourceTestCase.java
@@ -45,6 +45,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -60,10 +64,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseDataSourceResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseDataSourceResourceTestCase.java
index 4b1d88f90b7565..6b6fe96efd41b3 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseDataSourceResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseDataSourceResourceTestCase.java
@@ -41,6 +41,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -56,10 +60,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseFieldResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseFieldResourceTestCase.java
index 5f35f1a5e550a3..04ac185e83541e 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseFieldResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseFieldResourceTestCase.java
@@ -44,6 +44,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -59,10 +63,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseFieldSummaryResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseFieldSummaryResourceTestCase.java
index f7789f5668ae20..84c9b597169105 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseFieldSummaryResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseFieldSummaryResourceTestCase.java
@@ -41,6 +41,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -56,10 +60,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseRecommendationConfigurationResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseRecommendationConfigurationResourceTestCase.java
index 1f0e39970fa817..b8d7e70f3307c7 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseRecommendationConfigurationResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseRecommendationConfigurationResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseSiteResourceTestCase.java b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseSiteResourceTestCase.java
index 6161b1109a05c7..1dc5e098e8e3a3 100644
--- a/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseSiteResourceTestCase.java
+++ b/modules/apps/analytics/analytics-settings-rest-test/src/testIntegration/java/com/liferay/analytics/settings/rest/resource/v1_0/test/BaseSiteResourceTestCase.java
@@ -45,6 +45,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -60,10 +64,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/analytics/analytics-settings-web/build.gradle b/modules/apps/analytics/analytics-settings-web/build.gradle
index 2ef61e4cb9c408..dcbf8ab5c1b471 100644
--- a/modules/apps/analytics/analytics-settings-web/build.gradle
+++ b/modules/apps/analytics/analytics-settings-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.apache.httpcomponents", name: "httpclient", version: "4.5.13"
compileOnly group: "org.apache.httpcomponents", name: "httpcore", version: "4.4.14"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsCloudConnectionConfigurationScreen.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsCloudConnectionConfigurationScreen.java
index 91c79fd2d11ca7..d6439dca74a6a2 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsCloudConnectionConfigurationScreen.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsCloudConnectionConfigurationScreen.java
@@ -7,7 +7,7 @@
import com.liferay.configuration.admin.display.ConfigurationScreen;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsSyncedContactsDataConfigurationScreen.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsSyncedContactsDataConfigurationScreen.java
index af9eecd9251795..9014b4d416e01a 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsSyncedContactsDataConfigurationScreen.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsSyncedContactsDataConfigurationScreen.java
@@ -7,7 +7,7 @@
import com.liferay.configuration.admin.display.ConfigurationScreen;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsSyncedSitesConfigurationScreen.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsSyncedSitesConfigurationScreen.java
index dee53a9c0aa65b..18c26a78497ef9 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsSyncedSitesConfigurationScreen.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsSyncedSitesConfigurationScreen.java
@@ -7,7 +7,7 @@
import com.liferay.configuration.admin.display.ConfigurationScreen;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsWorkspaceConnectionConfigurationScreen.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsWorkspaceConnectionConfigurationScreen.java
index 6fb2b6040031ae..875f257139dd93 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsWorkspaceConnectionConfigurationScreen.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/AnalyticsWorkspaceConnectionConfigurationScreen.java
@@ -7,7 +7,7 @@
import com.liferay.configuration.admin.display.ConfigurationScreen;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/BaseAnalyticsConfigurationScreen.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/BaseAnalyticsConfigurationScreen.java
index 336ede48e22b48..4d6892d63f5a69 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/BaseAnalyticsConfigurationScreen.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/configuration/admin/display/BaseAnalyticsConfigurationScreen.java
@@ -16,15 +16,15 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Reference;
/**
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/AnalyticsSettingsDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/AnalyticsSettingsDisplayContext.java
index faca9ef815bbec..06114e51d8525f 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/AnalyticsSettingsDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/AnalyticsSettingsDisplayContext.java
@@ -9,8 +9,8 @@
import com.liferay.analytics.settings.web.internal.constants.AnalyticsSettingsWebKeys;
import com.liferay.portal.kernel.util.Validator;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Riccardo Ferrari
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/BaseDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/BaseDisplayContext.java
index 0c35849f46663d..414954a9709ec7 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/BaseDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/BaseDisplayContext.java
@@ -5,8 +5,8 @@
package com.liferay.analytics.settings.web.internal.display.context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Riccardo Ferrari
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/ChannelDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/ChannelDisplayContext.java
index ff6ddd1d125e44..719a0b5f4fab49 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/ChannelDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/ChannelDisplayContext.java
@@ -21,13 +21,13 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/ChannelManagementToolbarDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/ChannelManagementToolbarDisplayContext.java
index e8af6acaf49baa..cd24ab42f5d301 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/ChannelManagementToolbarDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/ChannelManagementToolbarDisplayContext.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.ResourceBundle;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ResourceBundle;
/**
* @author André Miranda
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/FieldDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/FieldDisplayContext.java
index 31fff03621ea2f..6e4ab7304e9114 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/FieldDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/FieldDisplayContext.java
@@ -21,15 +21,15 @@
import com.liferay.portal.kernel.util.TreeMapBuilder;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author Rachael Koestartyo
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/FieldManagementToolbarDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/FieldManagementToolbarDisplayContext.java
index 231effbe471589..ba42df16fbde6a 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/FieldManagementToolbarDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/FieldManagementToolbarDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Rachael Koestartyo
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/GroupDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/GroupDisplayContext.java
index 776d1271bbb2a5..945089d4414f1b 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/GroupDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/GroupDisplayContext.java
@@ -33,6 +33,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.util.comparator.GroupNameComparator;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
@@ -41,10 +45,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.StatusLine;
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/GroupManagementToolbarDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/GroupManagementToolbarDisplayContext.java
index 0c69a51dcbdda4..e2da1218c54a5e 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/GroupManagementToolbarDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/GroupManagementToolbarDisplayContext.java
@@ -18,14 +18,14 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marcellus Tavares
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/OrganizationDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/OrganizationDisplayContext.java
index ee3ffd4985aff6..3df84f465b3cd2 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/OrganizationDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/OrganizationDisplayContext.java
@@ -21,13 +21,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.util.comparator.OrganizationNameComparator;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.LinkedHashMap;
import java.util.Objects;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author André Miranda
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/OrganizationManagementToolbarDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/OrganizationManagementToolbarDisplayContext.java
index 351040ad894597..fd93389927243e 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/OrganizationManagementToolbarDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/OrganizationManagementToolbarDisplayContext.java
@@ -18,14 +18,14 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author André Miranda
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/QADisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/QADisplayContext.java
index a75ebc567420af..3d29a7ddd3d721 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/QADisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/QADisplayContext.java
@@ -5,8 +5,8 @@
package com.liferay.analytics.settings.web.internal.display.context;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Riccardo Ferrari
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/UserGroupDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/UserGroupDisplayContext.java
index bb4b0215938399..236d8befb035c1 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/UserGroupDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/UserGroupDisplayContext.java
@@ -20,13 +20,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.util.comparator.UserGroupNameComparator;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.LinkedHashMap;
import java.util.Objects;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author André Miranda
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/UserGroupManagementToolbarDisplayContext.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/UserGroupManagementToolbarDisplayContext.java
index f9e8842a5591df..9e929d8ef7d7f6 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/UserGroupManagementToolbarDisplayContext.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/display/context/UserGroupManagementToolbarDisplayContext.java
@@ -18,14 +18,14 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author André Miranda
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/AddChannelMVCActionCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/AddChannelMVCActionCommand.java
index 5cdce2d1217057..d5b81c108254b6 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/AddChannelMVCActionCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/AddChannelMVCActionCommand.java
@@ -31,13 +31,13 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+
import java.util.Collections;
import java.util.Dictionary;
import java.util.ResourceBundle;
import java.util.Set;
-import javax.portlet.ActionRequest;
-
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.StatusLine;
@@ -51,7 +51,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/add_channel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/AddChannelMVCRenderCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/AddChannelMVCRenderCommand.java
index 0498bf20403977..749b313b604daf 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/AddChannelMVCRenderCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/AddChannelMVCRenderCommand.java
@@ -15,7 +15,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/add_channel"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/BaseAnalyticsMVCActionCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/BaseAnalyticsMVCActionCommand.java
index 89ab2d20412c0c..ec86fce64f67e9 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/BaseAnalyticsMVCActionCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/BaseAnalyticsMVCActionCommand.java
@@ -37,6 +37,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.MutableRenderParameters;
+
import java.nio.charset.Charset;
import java.util.Dictionary;
@@ -44,10 +48,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.MutableRenderParameters;
-
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/BaseAnalyticsMVCRenderCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/BaseAnalyticsMVCRenderCommand.java
index 2a631614fdef0e..7b61da820ca403 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/BaseAnalyticsMVCRenderCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/BaseAnalyticsMVCRenderCommand.java
@@ -17,13 +17,13 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditChannelMVCActionCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditChannelMVCActionCommand.java
index e9b304839c1509..95d75eb3d3d9ba 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditChannelMVCActionCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditChannelMVCActionCommand.java
@@ -29,6 +29,8 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.Dictionary;
@@ -36,8 +38,6 @@
import java.util.ResourceBundle;
import java.util.Set;
-import javax.portlet.ActionRequest;
-
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.StatusLine;
@@ -51,7 +51,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/edit_channel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditChannelMVCRenderCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditChannelMVCRenderCommand.java
index 4988c51c6a13a9..43f29f65ca72b1 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditChannelMVCRenderCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditChannelMVCRenderCommand.java
@@ -15,7 +15,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/edit_channel"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsFieldsMVCRenderCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsFieldsMVCRenderCommand.java
index 02bf4a6d8d9646..9f9bef80b210f8 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsFieldsMVCRenderCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsFieldsMVCRenderCommand.java
@@ -15,7 +15,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/edit_synced_contacts_fields"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsGroupsMVCRenderCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsGroupsMVCRenderCommand.java
index 44b5465c20046a..896f4a88a6aebc 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsGroupsMVCRenderCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsGroupsMVCRenderCommand.java
@@ -15,7 +15,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/edit_synced_contacts_groups"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsMVCActionCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsMVCActionCommand.java
index 1d5b4d39da9d85..2fff0333cebeae 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsMVCActionCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsMVCActionCommand.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+
import java.util.Dictionary;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.StatusLine;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/edit_synced_contacts"
},
service = MVCActionCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsMVCRenderCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsMVCRenderCommand.java
index 688c1a2474c9a1..a72388a46e2931 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsMVCRenderCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsMVCRenderCommand.java
@@ -15,7 +15,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/edit_synced_contacts"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsOrganizationsMVCRenderCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsOrganizationsMVCRenderCommand.java
index eadcc6925f14f1..2a32ff7827bd8c 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsOrganizationsMVCRenderCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditSyncedContactsOrganizationsMVCRenderCommand.java
@@ -15,7 +15,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/edit_synced_contacts_organizations"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditWorkspaceConnectionMVCActionCommand.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditWorkspaceConnectionMVCActionCommand.java
index 6760fd1b346d0c..66011fde647df5 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditWorkspaceConnectionMVCActionCommand.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/portlet/action/EditWorkspaceConnectionMVCActionCommand.java
@@ -25,13 +25,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+
import java.util.Arrays;
import java.util.Dictionary;
import java.util.Iterator;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.StatusLine;
@@ -51,7 +51,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/analytics_settings/edit_workspace_connection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/ChannelSearch.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/ChannelSearch.java
index 55eaf5bdff1cff..ae310b54e19388 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/ChannelSearch.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/ChannelSearch.java
@@ -9,12 +9,12 @@
import com.liferay.portal.kernel.dao.search.DisplayTerms;
import com.liferay.portal.kernel.dao.search.SearchContainer;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author André Miranda
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/FieldChecker.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/FieldChecker.java
index c5134aeb0a2ee9..348f8c68626c30 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/FieldChecker.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/FieldChecker.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderResponse;
/**
* @author Rachael Koestartyo
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/FieldSearch.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/FieldSearch.java
index ba45187cca5f41..d48997ded8a487 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/FieldSearch.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/FieldSearch.java
@@ -9,12 +9,12 @@
import com.liferay.portal.kernel.dao.search.DisplayTerms;
import com.liferay.portal.kernel.dao.search.SearchContainer;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author Rachael Koestartyo
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/GroupChecker.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/GroupChecker.java
index e56b05a68255ba..ca8624210eecba 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/GroupChecker.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/GroupChecker.java
@@ -8,12 +8,12 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.model.Group;
-import java.util.Objects;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
+import java.util.Set;
/**
* @author André Miranda
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/GroupSearch.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/GroupSearch.java
index abe12a1ea63d13..779d07aa0f649f 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/GroupSearch.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/GroupSearch.java
@@ -9,12 +9,12 @@
import com.liferay.portal.kernel.dao.search.SearchContainer;
import com.liferay.portal.kernel.model.Group;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author Marcellus Tavares
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/OrganizationChecker.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/OrganizationChecker.java
index 25aba4fe54f00c..79302276e3a75e 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/OrganizationChecker.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/OrganizationChecker.java
@@ -8,9 +8,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.model.Organization;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Geyson Silva
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/OrganizationSearch.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/OrganizationSearch.java
index 80fdd9f9314100..f5191330fe960b 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/OrganizationSearch.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/OrganizationSearch.java
@@ -9,12 +9,12 @@
import com.liferay.portal.kernel.dao.search.SearchContainer;
import com.liferay.portal.kernel.model.Organization;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author André Miranda
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/UserGroupChecker.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/UserGroupChecker.java
index ee9b6262949b97..dbd32bcc08a8fd 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/UserGroupChecker.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/UserGroupChecker.java
@@ -8,9 +8,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.model.UserGroup;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Geyson Silva
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/UserGroupSearch.java b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/UserGroupSearch.java
index ebec9e8d755f29..a849b0d3b8651b 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/UserGroupSearch.java
+++ b/modules/apps/analytics/analytics-settings-web/src/main/java/com/liferay/analytics/settings/web/internal/search/UserGroupSearch.java
@@ -9,12 +9,12 @@
import com.liferay.portal.kernel.dao.search.SearchContainer;
import com.liferay.portal.kernel.model.UserGroup;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author André Miranda
*/
diff --git a/modules/apps/analytics/analytics-settings-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/analytics/analytics-settings-web/src/main/resources/META-INF/resources/init.jsp
index 4da48d1014312e..344908c5db20e5 100644
--- a/modules/apps/analytics/analytics-settings-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/analytics/analytics-settings-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -50,11 +50,11 @@ page import="com.liferay.portal.kernel.util.StringUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntriesUtil" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.util.List" %><%@
page import="java.util.Set" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/analytics/analytics-web/build.gradle b/modules/apps/analytics/analytics-web/build.gradle
index 2d9358249fccf2..4b339b9f02391b 100644
--- a/modules/apps/analytics/analytics-web/build.gradle
+++ b/modules/apps/analytics/analytics-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.jaxrs", version: "1.0.0"
diff --git a/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/jaxrs/application/MockOSBAsahPublisherApplication.java b/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/jaxrs/application/MockOSBAsahPublisherApplication.java
index c339fa83fb0199..9e9205bb0419c9 100644
--- a/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/jaxrs/application/MockOSBAsahPublisherApplication.java
+++ b/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/jaxrs/application/MockOSBAsahPublisherApplication.java
@@ -9,20 +9,20 @@
import com.liferay.portal.kernel.util.PropsKeys;
import com.liferay.portal.kernel.util.PropsUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Application;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Application;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/servlet/taglib/AnalyticsTopHeadDynamicInclude.java b/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/servlet/taglib/AnalyticsTopHeadDynamicInclude.java
index 738eb2ffd96aeb..905605b59aaca8 100644
--- a/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/servlet/taglib/AnalyticsTopHeadDynamicInclude.java
+++ b/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/servlet/taglib/AnalyticsTopHeadDynamicInclude.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/servlet/taglib/AnalyticsTopHeadJSPDynamicInclude.java b/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/servlet/taglib/AnalyticsTopHeadJSPDynamicInclude.java
index 75860c1b308159..793c4e038d763e 100644
--- a/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/servlet/taglib/AnalyticsTopHeadJSPDynamicInclude.java
+++ b/modules/apps/analytics/analytics-web/src/main/java/com/liferay/analytics/web/internal/servlet/taglib/AnalyticsTopHeadJSPDynamicInclude.java
@@ -30,15 +30,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Map;
import java.util.Objects;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/analytics/analytics-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/analytics/analytics-web/src/main/resources/META-INF/resources/init.jsp
index 5bd4332d129792..cb49b31bc38aa8 100644
--- a/modules/apps/analytics/analytics-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/analytics/analytics-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/announcements/announcements-test/src/testIntegration/java/com/liferay/announcements/web/internal/upgrade/v2_1_0/test/UpgradePortletPreferencesTest.java b/modules/apps/announcements/announcements-test/src/testIntegration/java/com/liferay/announcements/web/internal/upgrade/v2_1_0/test/UpgradePortletPreferencesTest.java
index 3bd8b8238d00e5..81adeaadd90c81 100644
--- a/modules/apps/announcements/announcements-test/src/testIntegration/java/com/liferay/announcements/web/internal/upgrade/v2_1_0/test/UpgradePortletPreferencesTest.java
+++ b/modules/apps/announcements/announcements-test/src/testIntegration/java/com/liferay/announcements/web/internal/upgrade/v2_1_0/test/UpgradePortletPreferencesTest.java
@@ -47,13 +47,13 @@
import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
import com.liferay.portal.upgrade.test.util.UpgradeTestUtil;
+import jakarta.portlet.PortletPreferences;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/announcements/announcements-uad/build.gradle b/modules/apps/announcements/announcements-uad/build.gradle
index ba2140b77e7569..d59f59f5a93306 100644
--- a/modules/apps/announcements/announcements-uad/build.gradle
+++ b/modules/apps/announcements/announcements-uad/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:announcements:announcements-api")
compileOnly project(":apps:user-associated-data:user-associated-data-api")
diff --git a/modules/apps/announcements/announcements-uad/src/main/java/com/liferay/announcements/uad/display/AnnouncementsEntryUADDisplay.java b/modules/apps/announcements/announcements-uad/src/main/java/com/liferay/announcements/uad/display/AnnouncementsEntryUADDisplay.java
index 6a503d31cb7c64..0eb5696da3aad2 100644
--- a/modules/apps/announcements/announcements-uad/src/main/java/com/liferay/announcements/uad/display/AnnouncementsEntryUADDisplay.java
+++ b/modules/apps/announcements/announcements-uad/src/main/java/com/liferay/announcements/uad/display/AnnouncementsEntryUADDisplay.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.user.associated.data.display.UADDisplay;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/announcements/announcements-web/build.gradle b/modules/apps/announcements/announcements-web/build.gradle
index bb58c44b428be3..4ab9336549e28d 100644
--- a/modules/apps/announcements/announcements-web/build.gradle
+++ b/modules/apps/announcements/announcements-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/application/list/AnnouncementsPanelApp.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/application/list/AnnouncementsPanelApp.java
index 406f3da9fd8287..be672a6645b587 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/application/list/AnnouncementsPanelApp.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/application/list/AnnouncementsPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/change/tracking/spi/display/AnnouncementsDeliveryCTDisplayRenderer.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/change/tracking/spi/display/AnnouncementsDeliveryCTDisplayRenderer.java
index 8e7d27759700bf..e0217e8807f012 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/change/tracking/spi/display/AnnouncementsDeliveryCTDisplayRenderer.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/change/tracking/spi/display/AnnouncementsDeliveryCTDisplayRenderer.java
@@ -21,11 +21,11 @@
import com.liferay.users.admin.constants.UserScreenNavigationEntryConstants;
import com.liferay.users.admin.constants.UsersAdminPortletKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/change/tracking/spi/display/AnnouncementsEntryCTDisplayRenderer.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/change/tracking/spi/display/AnnouncementsEntryCTDisplayRenderer.java
index bca86f40ae0a63..981904b7059857 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/change/tracking/spi/display/AnnouncementsEntryCTDisplayRenderer.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/change/tracking/spi/display/AnnouncementsEntryCTDisplayRenderer.java
@@ -15,11 +15,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsAdminViewDisplayContext.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsAdminViewDisplayContext.java
index 488dc26cc300e7..b56f7fac2d65b4 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsAdminViewDisplayContext.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsAdminViewDisplayContext.java
@@ -32,6 +32,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.announcements.service.permission.AnnouncementsEntryPermission;
+import jakarta.portlet.RenderRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -39,10 +43,6 @@
import java.util.Objects;
import java.util.UUID;
-import javax.portlet.RenderRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Roberto Díaz
*/
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsAdminViewManagementToolbarDisplayContext.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsAdminViewManagementToolbarDisplayContext.java
index 30453f515881b7..c1dae373c2ae30 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsAdminViewManagementToolbarDisplayContext.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsAdminViewManagementToolbarDisplayContext.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alejandro Tardín
*/
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsDisplayContext.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsDisplayContext.java
index 1a50ea8ed8e7d0..1f406f0d8ddd17 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsDisplayContext.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/AnnouncementsDisplayContext.java
@@ -55,6 +55,13 @@
import com.liferay.segments.model.SegmentsEntryRole;
import com.liferay.segments.service.SegmentsEntryRoleLocalServiceUtil;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
@@ -65,13 +72,6 @@
import java.util.Set;
import java.util.UUID;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Adolfo Pérez
* @author Roberto Díaz
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/helper/AnnouncementsRequestHelper.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/helper/AnnouncementsRequestHelper.java
index 4124e131052062..851e9b283e757c 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/helper/AnnouncementsRequestHelper.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/display/context/helper/AnnouncementsRequestHelper.java
@@ -11,10 +11,10 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AlertsPortlet.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AlertsPortlet.java
index 90be6eea1ddff6..2b108a92f9a5cd 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AlertsPortlet.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AlertsPortlet.java
@@ -16,14 +16,14 @@
import com.liferay.segments.configuration.provider.SegmentsConfigurationProvider;
import com.liferay.segments.context.RequestContextMapper;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,15 +42,16 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Alerts", "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.always-display-default-configuration-icons=true",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/alerts/view",
- "javax.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
- "javax.portlet.preferences=classpath:/META-INF/portlet-preferences/default-portlet-preferences.xml",
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Alerts",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.always-display-default-configuration-icons=true",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/alerts/view",
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
+ "jakarta.portlet.preferences=classpath:/META-INF/portlet-preferences/default-portlet-preferences.xml",
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AnnouncementsAdminPortlet.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AnnouncementsAdminPortlet.java
index 524c3b3cf28629..5d9e7fcf23b5ed 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AnnouncementsAdminPortlet.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AnnouncementsAdminPortlet.java
@@ -16,14 +16,14 @@
import com.liferay.segments.configuration.provider.SegmentsConfigurationProvider;
import com.liferay.segments.context.RequestContextMapper;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,15 +42,15 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Announcements",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.mvc-command-names-default-views=/announcements/view",
- "javax.portlet.init-param.portlet-title-based-navigation=true",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Announcements",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.mvc-command-names-default-views=/announcements/view",
+ "jakarta.portlet.init-param.portlet-title-based-navigation=true",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AnnouncementsPortlet.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AnnouncementsPortlet.java
index 4f289e937f151f..58f2ab88452a10 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AnnouncementsPortlet.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/AnnouncementsPortlet.java
@@ -16,14 +16,14 @@
import com.liferay.segments.configuration.provider.SegmentsConfigurationProvider;
import com.liferay.segments.context.RequestContextMapper;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,15 +42,15 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Announcements",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.always-display-default-configuration-icons=true",
- "javax.portlet.init-param.mvc-command-names-default-views=/announcements/view",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Announcements",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.always-display-default-configuration-icons=true",
+ "jakarta.portlet.init-param.mvc-command-names-default-views=/announcements/view",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ActionUtil.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ActionUtil.java
index e30a0f3d51a192..5e283fa5ba6a24 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ActionUtil.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ActionUtil.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Raymond Augé
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/AnnouncementsConfigurationAction.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/AnnouncementsConfigurationAction.java
index dac4fecb95651d..9c22201597d982 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/AnnouncementsConfigurationAction.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/AnnouncementsConfigurationAction.java
@@ -16,12 +16,12 @@
import com.liferay.segments.configuration.provider.SegmentsConfigurationProvider;
import com.liferay.segments.context.RequestContextMapper;
-import javax.portlet.PortletConfig;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
* @author Adolfo Pérez
*/
@Component(
- property = "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
+ property = "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
service = ConfigurationAction.class
)
public class AnnouncementsConfigurationAction
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/EditEntryMVCActionCommand.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/EditEntryMVCActionCommand.java
index 19078d36d7ec70..490aa124b09695 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/EditEntryMVCActionCommand.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/EditEntryMVCActionCommand.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.Date;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,9 +40,9 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
"mvc.command.name=/announcements/edit_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/EditEntryMVCRenderCommand.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/EditEntryMVCRenderCommand.java
index f221e31b6e6042..b8cc9c2bbfa482 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/EditEntryMVCRenderCommand.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/EditEntryMVCRenderCommand.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.security.auth.PrincipalException;
import com.liferay.portal.kernel.servlet.SessionErrors;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -24,9 +24,9 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
"mvc.command.name=/announcements/edit_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ViewEntryMVCRenderCommand.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ViewEntryMVCRenderCommand.java
index 6b34a99197fa2e..0e26c41f0c69ff 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ViewEntryMVCRenderCommand.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ViewEntryMVCRenderCommand.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -26,9 +26,9 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
"mvc.command.name=/announcements/view_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ViewMVCRenderCommand.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ViewMVCRenderCommand.java
index 2b1560a9876d90..7010552ee68b00 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ViewMVCRenderCommand.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/action/ViewMVCRenderCommand.java
@@ -11,10 +11,10 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
@@ -24,9 +24,9 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ALERTS,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
"mvc.command.name=/", "mvc.command.name=/alerts/view",
"mvc.command.name=/announcements/view"
},
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/configuration/icon/DeleteEntryPortletConfigurationIcon.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/configuration/icon/DeleteEntryPortletConfigurationIcon.java
index 518eabce7a03b3..c9d04f8ba5b7b6 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/configuration/icon/DeleteEntryPortletConfigurationIcon.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/configuration/icon/DeleteEntryPortletConfigurationIcon.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.announcements.service.permission.AnnouncementsEntryPermission;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
"path=/announcements/view_entry"
},
service = PortletConfigurationIcon.class
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/configuration/icon/EditEntryPortletConfigurationIcon.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/configuration/icon/EditEntryPortletConfigurationIcon.java
index 91ace45994c480..3fc109208d63f4 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/configuration/icon/EditEntryPortletConfigurationIcon.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/portlet/configuration/icon/EditEntryPortletConfigurationIcon.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.announcements.service.permission.AnnouncementsEntryPermission;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
+ "jakarta.portlet.name=" + AnnouncementsPortletKeys.ANNOUNCEMENTS_ADMIN,
"path=/announcements/view_entry"
},
service = PortletConfigurationIcon.class
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/search/AnnouncementsEntryChecker.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/search/AnnouncementsEntryChecker.java
index c20408704ced01..8e27da24a5576d 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/search/AnnouncementsEntryChecker.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/search/AnnouncementsEntryChecker.java
@@ -23,7 +23,7 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.announcements.service.permission.AnnouncementsEntryPermission;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Roberto Díaz
diff --git a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/upgrade/v2_1_0/UpgradePortletPreferences.java b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/upgrade/v2_1_0/UpgradePortletPreferences.java
index 9cc24e0169920d..0456891584dd14 100644
--- a/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/upgrade/v2_1_0/UpgradePortletPreferences.java
+++ b/modules/apps/announcements/announcements-web/src/main/java/com/liferay/announcements/web/internal/upgrade/v2_1_0/UpgradePortletPreferences.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.function.Function;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.function.Function;
/**
* @author Marco Galluzzi
diff --git a/modules/apps/announcements/announcements-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/announcements/announcements-web/src/main/resources/META-INF/resources/init.jsp
index 458a66c033e125..da5c8dde0c0f09 100644
--- a/modules/apps/announcements/announcements-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/announcements/announcements-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/application-list/application-list-api/build.gradle b/modules/apps/application-list/application-list-api/build.gradle
index 4db172914015b0..bf58491b141f4a 100644
--- a/modules/apps/application-list/application-list-api/build.gradle
+++ b/modules/apps/application-list/application-list-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:product-navigation:product-navigation-personal-menu-api")
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BaseJSPPanelApp.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BaseJSPPanelApp.java
index f4d0160733c0b5..466753e2eeda6f 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BaseJSPPanelApp.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BaseJSPPanelApp.java
@@ -9,13 +9,13 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.io.IOException;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
/**
* Provides a skeletal implementation of the {@link PanelApp} with JSP support
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BaseJSPPanelCategory.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BaseJSPPanelCategory.java
index 6c3efe13879e19..2459a65708abf6 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BaseJSPPanelCategory.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BaseJSPPanelCategory.java
@@ -9,13 +9,13 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.io.IOException;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
/**
* Provides a skeletal implementation of the {@link PanelCategory} with JSP
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BasePanelApp.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BasePanelApp.java
index 8ff75ee779a1e9..415a6e26a28463 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BasePanelApp.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BasePanelApp.java
@@ -26,18 +26,18 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Provides a skeletal implementation of the {@link PanelApp} to minimize the
* effort required to implement this interface.
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BasePanelCategory.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BasePanelCategory.java
index bd20a0419be22c..2755a216011ded 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BasePanelCategory.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/BasePanelCategory.java
@@ -15,13 +15,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Provides a skeletal implementation of the {@link PanelCategory} to minimize
* the effort required to implement this interface.
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/GroupProvider.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/GroupProvider.java
index aefa542e5fb639..25ed16d85edda6 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/GroupProvider.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/GroupProvider.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.model.Group;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* Provides an interface that defines how a Group
(in
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/PanelApp.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/PanelApp.java
index 8f6ca04424fd89..2494e1900f3a42 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/PanelApp.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/PanelApp.java
@@ -9,12 +9,12 @@
import com.liferay.portal.kernel.model.Portlet;
import com.liferay.portal.kernel.model.User;
-import java.io.IOException;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
/**
* Provides an interface that defines applications to be used by a
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/PanelCategory.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/PanelCategory.java
index 0506bafee3abcc..39e1c781d1f962 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/PanelCategory.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/PanelCategory.java
@@ -10,10 +10,10 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.security.permission.PermissionChecker;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
/**
* Provides an interface that defines application categories to be used by a
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/RootPanelCategory.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/RootPanelCategory.java
index 153db12424a1d3..85b70f63e42e69 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/RootPanelCategory.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/RootPanelCategory.java
@@ -11,10 +11,10 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.security.permission.PermissionChecker;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* Represents the root panel category for all implemented categories in the
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapter.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapter.java
index fb22f304931067..59799787bba044 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapter.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapter.java
@@ -12,12 +12,12 @@
import com.liferay.portal.kernel.portlet.PortletConfigFactoryUtil;
import com.liferay.portal.kernel.util.JavaConstants;
+import jakarta.portlet.PortletConfig;
+
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.function.Supplier;
-import javax.portlet.PortletConfig;
-
/**
* @author Adolfo Pérez
*/
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapterRegistry.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapterRegistry.java
index daabf9cd50b6db..05bc1857d09fb4 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapterRegistry.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapterRegistry.java
@@ -11,11 +11,11 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.model.Portlet;
+import jakarta.servlet.ServletContext;
+
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.ServletContext;
-
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -65,7 +65,7 @@ protected void deactivate() {
private ServiceTracker _serviceTracker;
@Reference(
- target = "(&(original.bean=true)(bean.id=javax.servlet.ServletContext))"
+ target = "(&(original.bean=true)(bean.id=jakarta.servlet.ServletContext))"
)
private ServletContext _servletContext;
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapterServiceTrackerCustomizer.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapterServiceTrackerCustomizer.java
index a1952ad03352e0..5d249c6adb0434 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapterServiceTrackerCustomizer.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/adapter/PortletPanelAppAdapterServiceTrackerCustomizer.java
@@ -37,7 +37,7 @@ public PortletPanelAppAdapterServiceTrackerCustomizer(
@Override
public PanelApp addingService(ServiceReference serviceReference) {
String portletId = (String)serviceReference.getProperty(
- "javax.portlet.name");
+ "jakarta.portlet.name");
if (Validator.isNull(portletId)) {
return null;
diff --git a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/deploy/hot/LegacyPortletPanelAppHotDeployListener.java b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/deploy/hot/LegacyPortletPanelAppHotDeployListener.java
index 71b827ec288800..af080bc996d532 100644
--- a/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/deploy/hot/LegacyPortletPanelAppHotDeployListener.java
+++ b/modules/apps/application-list/application-list-api/src/main/java/com/liferay/application/list/deploy/hot/LegacyPortletPanelAppHotDeployListener.java
@@ -24,6 +24,8 @@
import com.liferay.portal.kernel.xml.UnsecureSAXReaderUtil;
import com.liferay.portal.util.PortletCategoryUtil;
+import jakarta.servlet.ServletContext;
+
import java.io.IOException;
import java.util.ArrayList;
@@ -34,8 +36,6 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.ServletContext;
-
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/application-list/application-list-my-account-permissions/build.gradle b/modules/apps/application-list/application-list-my-account-permissions/build.gradle
index dcd722da3a24be..d5bcc2d32f99ad 100644
--- a/modules/apps/application-list/application-list-my-account-permissions/build.gradle
+++ b/modules/apps/application-list/application-list-my-account-permissions/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/application-list/application-list-my-account-permissions/src/main/java/com/liferay/application/list/my/account/permissions/internal/model/listener/CompanyModelListener.java b/modules/apps/application-list/application-list-my-account-permissions/src/main/java/com/liferay/application/list/my/account/permissions/internal/model/listener/CompanyModelListener.java
index 69cd99e2c096dd..13b8ea17924839 100644
--- a/modules/apps/application-list/application-list-my-account-permissions/src/main/java/com/liferay/application/list/my/account/permissions/internal/model/listener/CompanyModelListener.java
+++ b/modules/apps/application-list/application-list-my-account-permissions/src/main/java/com/liferay/application/list/my/account/permissions/internal/model/listener/CompanyModelListener.java
@@ -35,12 +35,12 @@
import com.liferay.portal.kernel.util.PortletKeys;
import com.liferay.portal.kernel.util.PrefsProps;
+import jakarta.portlet.PortletPreferences;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.portlet.PortletPreferences;
-
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/application-list/application-list-taglib/build.gradle b/modules/apps/application-list/application-list-taglib/build.gradle
index e6927684952b68..3d7af4f268bfbe 100644
--- a/modules/apps/application-list/application-list-taglib/build.gradle
+++ b/modules/apps/application-list/application-list-taglib/build.gradle
@@ -1,12 +1,12 @@
dependencies {
+ compileOnly group: "com.liferay", name: "org.osgi.service.http.whiteboard", version: "1.1.1.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
- compileOnly group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.1.1"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:frontend-taglib:frontend-taglib")
compileOnly project(":apps:frontend-taglib:frontend-taglib-clay")
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/display/context/logic/PanelAppContentHelper.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/display/context/logic/PanelAppContentHelper.java
index 123a46073f1c32..65b5c2aed47ba5 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/display/context/logic/PanelAppContentHelper.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/display/context/logic/PanelAppContentHelper.java
@@ -21,12 +21,12 @@
import com.liferay.portal.servlet.DynamicServletRequestUtil;
import com.liferay.portlet.LiferayPortletUtil;
-import java.io.Writer;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.Writer;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/display/context/ContentPanelCategoryDisplayContext.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/display/context/ContentPanelCategoryDisplayContext.java
index fffee36102e1ca..75271a9d1dd311 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/display/context/ContentPanelCategoryDisplayContext.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/display/context/ContentPanelCategoryDisplayContext.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Pavel Savinov
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/servlet/ServletContextUtil.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/servlet/ServletContextUtil.java
index a2b8a6525965ec..1c03d6f1ea7527 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/servlet/ServletContextUtil.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/servlet/ServletContextUtil.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.module.service.Snapshot;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/util/PanelAppUtil.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/util/PanelAppUtil.java
index c4b30b29ddd6eb..1767c517e5e25a 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/util/PanelAppUtil.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/util/PanelAppUtil.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/util/PanelCategoryUtil.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/util/PanelCategoryUtil.java
index ac852144c83935..a8b27416b9df09 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/util/PanelCategoryUtil.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/internal/util/PanelCategoryUtil.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/ApplicationContentTag.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/ApplicationContentTag.java
index 07614ad8ea792c..8420513320bd83 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/ApplicationContentTag.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/ApplicationContentTag.java
@@ -5,7 +5,7 @@
package com.liferay.application.list.taglib.servlet.taglib;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/BasePanelTag.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/BasePanelTag.java
index 1653a7e8605099..36cfb827a51fc9 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/BasePanelTag.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/BasePanelTag.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/PanelCategoryBodyTag.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/PanelCategoryBodyTag.java
index 73f6e9c30118bc..f4a0a0e4844015 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/PanelCategoryBodyTag.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/PanelCategoryBodyTag.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Julio Camarero
diff --git a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/PanelTag.java b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/PanelTag.java
index e7c2c4189b93d5..61d25d1566ea41 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/PanelTag.java
+++ b/modules/apps/application-list/application-list-taglib/src/main/java/com/liferay/application/list/taglib/servlet/taglib/PanelTag.java
@@ -12,10 +12,10 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
+import java.util.List;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/application-list/application-list-taglib/src/main/resources/META-INF/resources/init.jsp b/modules/apps/application-list/application-list-taglib/src/main/resources/META-INF/resources/init.jsp
index 56a36eeb85e0a7..26a8dd9c44401c 100644
--- a/modules/apps/application-list/application-list-taglib/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/application-list/application-list-taglib/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/application-list/application-list-test/build.gradle b/modules/apps/application-list/application-list-test/build.gradle
index 056eb684c8d5c2..d7f6ed64e9d31b 100644
--- a/modules/apps/application-list/application-list-test/build.gradle
+++ b/modules/apps/application-list/application-list-test/build.gradle
@@ -1,6 +1,6 @@
dependencies {
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
testIntegrationImplementation group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
testIntegrationImplementation project(":apps:application-list:application-list-api")
testIntegrationImplementation project(":test:arquillian-extension-junit-bridge")
diff --git a/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/deploy/hot/test/LegacyPortletPanelAppHotDeployListenerTest.java b/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/deploy/hot/test/LegacyPortletPanelAppHotDeployListenerTest.java
index 40d14d7a5a883b..b2b28ebec952e9 100644
--- a/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/deploy/hot/test/LegacyPortletPanelAppHotDeployListenerTest.java
+++ b/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/deploy/hot/test/LegacyPortletPanelAppHotDeployListenerTest.java
@@ -24,7 +24,7 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.junit.After;
import org.junit.Assert;
diff --git a/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/display/context/logic/test/application/list/ApplicationsMenuTestPanelApp.java b/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/display/context/logic/test/application/list/ApplicationsMenuTestPanelApp.java
index f2c96e62ca4e81..51e1a7c2b42347 100644
--- a/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/display/context/logic/test/application/list/ApplicationsMenuTestPanelApp.java
+++ b/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/display/context/logic/test/application/list/ApplicationsMenuTestPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + ApplicationsMenuTestPortletKeys.APPLICATIONS_MENU_TEST_PORTLET + ")"
+ target = "(jakarta.portlet.name=" + ApplicationsMenuTestPortletKeys.APPLICATIONS_MENU_TEST_PORTLET + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/display/context/logic/test/portlet/ApplicationsMenuTestPortlet.java b/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/display/context/logic/test/portlet/ApplicationsMenuTestPortlet.java
index c4590b5de66318..8841dbe027397f 100644
--- a/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/display/context/logic/test/portlet/ApplicationsMenuTestPortlet.java
+++ b/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/display/context/logic/test/portlet/ApplicationsMenuTestPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.application.list.display.context.logic.test.constants.ApplicationsMenuTestPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -20,10 +20,11 @@
"com.liferay.portlet.add-default-resource=true",
"com.liferay.portlet.instanceable=true",
"com.liferay.portlet.preferences-owned-by-group=true",
- "com.liferay.portlet.scopeable=true", "javax.portlet.display-name=Test",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.name=" + ApplicationsMenuTestPortletKeys.APPLICATIONS_MENU_TEST_PORTLET,
- "javax.portlet.version=3.0"
+ "com.liferay.portlet.scopeable=true",
+ "jakarta.portlet.display-name=Test",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.name=" + ApplicationsMenuTestPortletKeys.APPLICATIONS_MENU_TEST_PORTLET,
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/my/account/permissions/test/PanelAppMyAccountPermissionsTest.java b/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/my/account/permissions/test/PanelAppMyAccountPermissionsTest.java
index 4f1db4002aea47..20d301a17e34aa 100644
--- a/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/my/account/permissions/test/PanelAppMyAccountPermissionsTest.java
+++ b/modules/apps/application-list/application-list-test/src/testIntegration/java/com/liferay/application/list/my/account/permissions/test/PanelAppMyAccountPermissionsTest.java
@@ -30,12 +30,12 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.util.PortalInstances;
+import jakarta.portlet.GenericPortlet;
+import jakarta.portlet.Portlet;
+
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import javax.portlet.GenericPortlet;
-import javax.portlet.Portlet;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -167,7 +167,7 @@ private void _registerTestPortlet() {
_bundleContext.registerService(
Portlet.class, new TestPortlet(),
HashMapDictionaryBuilder.put(
- "javax.portlet.name", _testPortletId
+ "jakarta.portlet.name", _testPortletId
).build()));
}
diff --git a/modules/apps/archived/export-import-resources-importer/build.gradle b/modules/apps/archived/export-import-resources-importer/build.gradle
index e5d77d3c34dcae..43c11f0132186b 100644
--- a/modules/apps/archived/export-import-resources-importer/build.gradle
+++ b/modules/apps/archived/export-import-resources-importer/build.gradle
@@ -1,11 +1,11 @@
dependencies {
+ compileOnly group: "com.liferay", name: "org.osgi.service.http.whiteboard", version: "1.1.1.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
- compileOnly group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.1.1"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:document-library:document-library-api")
compileOnly project(":apps:dynamic-data-lists:dynamic-data-lists-api")
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/extender/BundleServletContextAdapter.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/extender/BundleServletContextAdapter.java
index 3a357167e7a434..e4ba99f70ec0f8 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/extender/BundleServletContextAdapter.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/extender/BundleServletContextAdapter.java
@@ -9,6 +9,17 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
+
import java.io.IOException;
import java.io.InputStream;
@@ -19,17 +30,6 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.Filter;
-import javax.servlet.FilterRegistration;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRegistration;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import javax.servlet.descriptor.JspConfigDescriptor;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.wiring.BundleWiring;
import org.osgi.service.http.context.ServletContextHelper;
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/extender/ResourceImporterExtender.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/extender/ResourceImporterExtender.java
index 18f10701a8725b..06d49a62e43cc1 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/extender/ResourceImporterExtender.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/extender/ResourceImporterExtender.java
@@ -18,13 +18,13 @@
import com.liferay.portal.kernel.util.PropertiesUtil;
import com.liferay.portal.plugin.PluginPackageUtil;
+import jakarta.servlet.ServletContext;
+
import java.io.IOException;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.servlet.ServletContext;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/messaging/MessagingHotDeployListener.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/messaging/MessagingHotDeployListener.java
index eef8f4aaa05e52..2fa88e5132cf28 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/messaging/MessagingHotDeployListener.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/messaging/MessagingHotDeployListener.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.messaging.Message;
import com.liferay.portal.kernel.messaging.MessageBusUtil;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/messaging/ResourcesImporterHotDeployMessageListener.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/messaging/ResourcesImporterHotDeployMessageListener.java
index ba4b7bd6260101..60d6ab0b49b903 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/messaging/ResourcesImporterHotDeployMessageListener.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/messaging/ResourcesImporterHotDeployMessageListener.java
@@ -33,9 +33,9 @@
import com.liferay.portal.kernel.util.HashMapDictionaryBuilder;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Dictionary;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Dictionary;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/DefaultPortletPreferencesTranslator.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/DefaultPortletPreferencesTranslator.java
index 290219e9244b09..e3f256c46e4906 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/DefaultPortletPreferencesTranslator.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/DefaultPortletPreferencesTranslator.java
@@ -9,8 +9,8 @@
import com.liferay.exportimport.resources.importer.portlet.preferences.PortletPreferencesTranslator;
import com.liferay.portal.kernel.json.JSONObject;
-import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/JournalPortletPreferencesTranslator.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/JournalPortletPreferencesTranslator.java
index a72b6ff30aec94..3dd308cb92cc45 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/JournalPortletPreferencesTranslator.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/JournalPortletPreferencesTranslator.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.util.FileUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/RSSPortletPreferencesTranslator.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/RSSPortletPreferencesTranslator.java
index 6ebd5f29b6c323..be176cb4979826 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/RSSPortletPreferencesTranslator.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/portlet/preferences/RSSPortletPreferencesTranslator.java
@@ -8,13 +8,13 @@
import com.liferay.exportimport.resources.importer.portlet.preferences.PortletPreferencesTranslator;
import com.liferay.portal.kernel.json.JSONObject;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletPreferences;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
/**
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/BaseImporter.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/BaseImporter.java
index ae50de10993819..d11435e46b28e6 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/BaseImporter.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/BaseImporter.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.LocaleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.ServletContext;
-
/**
* @author Brian Wing Shun Chan
* @author Raymond Augé
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/FileSystemImporter.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/FileSystemImporter.java
index b0fdb19f3e14ff..352b8949ecacf5 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/FileSystemImporter.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/FileSystemImporter.java
@@ -93,6 +93,8 @@
import com.liferay.portal.search.index.IndexStatusManager;
import com.liferay.portlet.display.template.PortletDisplayTemplate;
+import jakarta.portlet.PortletPreferences;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -111,8 +113,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.portlet.PortletPreferences;
-
/**
* @author Ryan Park
* @author Raymond Augé
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/Importer.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/Importer.java
index 3846b3529640e8..eae03672ee38cd 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/Importer.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/Importer.java
@@ -5,7 +5,7 @@
package com.liferay.exportimport.resources.importer.internal.util;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/ImporterFactory.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/ImporterFactory.java
index ed6b0cdca8acb3..22356709c91ed3 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/ImporterFactory.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/ImporterFactory.java
@@ -39,13 +39,13 @@
import com.liferay.portal.plugin.PluginPackageUtil;
import com.liferay.portal.search.index.IndexStatusManager;
+import jakarta.servlet.ServletContext;
+
import java.net.URL;
import java.net.URLConnection;
import java.util.Set;
-import javax.servlet.ServletContext;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/PluginPackageProperties.java b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/PluginPackageProperties.java
index 5501b5a7d1c35d..bf2d81d7f2256f 100644
--- a/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/PluginPackageProperties.java
+++ b/modules/apps/archived/export-import-resources-importer/src/main/java/com/liferay/exportimport/resources/importer/internal/util/PluginPackageProperties.java
@@ -13,13 +13,13 @@
import com.liferay.portal.kernel.util.PropertiesUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.servlet.ServletContext;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import javax.servlet.ServletContext;
-
/**
* @author Michael C. Han
*/
diff --git a/modules/apps/asset/asset-api/build.gradle b/modules/apps/asset/asset-api/build.gradle
index b84107c5935fa4..2af8c82fb542a7 100644
--- a/modules/apps/asset/asset-api/build.gradle
+++ b/modules/apps/asset/asset-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:dynamic-data-mapping:dynamic-data-mapping-api")
diff --git a/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetEntryQueryProcessor.java b/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetEntryQueryProcessor.java
index adc63ca5c2d6cc..29ab55be187cfb 100644
--- a/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetEntryQueryProcessor.java
+++ b/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetEntryQueryProcessor.java
@@ -8,7 +8,7 @@
import com.liferay.asset.kernel.service.persistence.AssetEntryQuery;
import com.liferay.portal.kernel.model.User;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Jorge Ferrer
diff --git a/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetHelper.java b/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetHelper.java
index 5d5c48ef22e9f9..75a3a018a4b5eb 100644
--- a/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetHelper.java
+++ b/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetHelper.java
@@ -17,6 +17,10 @@
import com.liferay.portal.kernel.search.SearchContext;
import com.liferay.portal.search.hits.SearchHits;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.List;
@@ -25,10 +29,6 @@
import java.util.Set;
import java.util.TimeZone;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetPublisherAddItemHolder.java b/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetPublisherAddItemHolder.java
index 8a0705e28ca99b..16b71dffea99ff 100644
--- a/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetPublisherAddItemHolder.java
+++ b/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/AssetPublisherAddItemHolder.java
@@ -10,13 +10,13 @@
import com.liferay.portal.kernel.util.CollatorUtil;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.portlet.PortletURL;
+
import java.text.Collator;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
/**
* @author Preston Crary
*/
diff --git a/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/LinkedAssetEntryIdsUtil.java b/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/LinkedAssetEntryIdsUtil.java
index cdba9c0a9c3b8b..d3b3369a2981fa 100644
--- a/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/LinkedAssetEntryIdsUtil.java
+++ b/modules/apps/asset/asset-api/src/main/java/com/liferay/asset/util/LinkedAssetEntryIdsUtil.java
@@ -7,12 +7,12 @@
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.HashSet;
-import java.util.Set;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.HashSet;
+import java.util.Set;
/**
* @author Lourdes Fernández Besada
diff --git a/modules/apps/asset/asset-auto-tagger-opennlp-test/src/testIntegration/java/com/liferay/asset/auto/tagger/opennlp/test/OpenNLPDocumentAssetAutoTaggerTest.java b/modules/apps/asset/asset-auto-tagger-opennlp-test/src/testIntegration/java/com/liferay/asset/auto/tagger/opennlp/test/OpenNLPDocumentAssetAutoTaggerTest.java
index 4a2f00954cb2ca..7063f0c7ae23cd 100644
--- a/modules/apps/asset/asset-auto-tagger-opennlp-test/src/testIntegration/java/com/liferay/asset/auto/tagger/opennlp/test/OpenNLPDocumentAssetAutoTaggerTest.java
+++ b/modules/apps/asset/asset-auto-tagger-opennlp-test/src/testIntegration/java/com/liferay/asset/auto/tagger/opennlp/test/OpenNLPDocumentAssetAutoTaggerTest.java
@@ -16,17 +16,17 @@
import com.liferay.portal.kernel.test.util.TestPropsValues;
import com.liferay.portal.kernel.util.ContentTypes;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git a/modules/apps/asset/asset-auto-tagger-test/src/testIntegration/java/com/liferay/asset/auto/tagger/internal/osgi/commands/test/AssetAutoTaggerOSGiCommandsTest.java b/modules/apps/asset/asset-auto-tagger-test/src/testIntegration/java/com/liferay/asset/auto/tagger/internal/osgi/commands/test/AssetAutoTaggerOSGiCommandsTest.java
index 1836262aaa3d64..6a98b882fc7ea6 100644
--- a/modules/apps/asset/asset-auto-tagger-test/src/testIntegration/java/com/liferay/asset/auto/tagger/internal/osgi/commands/test/AssetAutoTaggerOSGiCommandsTest.java
+++ b/modules/apps/asset/asset-auto-tagger-test/src/testIntegration/java/com/liferay/asset/auto/tagger/internal/osgi/commands/test/AssetAutoTaggerOSGiCommandsTest.java
@@ -28,6 +28,12 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -35,12 +41,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Rule;
diff --git a/modules/apps/asset/asset-auto-tagger-web/build.gradle b/modules/apps/asset/asset-auto-tagger-web/build.gradle
index 87ffaf1086e0cd..23348990ef8c5d 100644
--- a/modules/apps/asset/asset-auto-tagger-web/build.gradle
+++ b/modules/apps/asset/asset-auto-tagger-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-auto-tagger-api")
compileOnly project(":apps:configuration-admin:configuration-admin-api")
diff --git a/modules/apps/asset/asset-auto-tagger-web/src/main/java/com/liferay/asset/auto/tagger/web/internal/configuration/admin/display/AssetAutoTaggerSiteSettingsConfigurationScreenWrapper.java b/modules/apps/asset/asset-auto-tagger-web/src/main/java/com/liferay/asset/auto/tagger/web/internal/configuration/admin/display/AssetAutoTaggerSiteSettingsConfigurationScreenWrapper.java
index 9e18b856bae726..987e8d58ee6bbf 100644
--- a/modules/apps/asset/asset-auto-tagger-web/src/main/java/com/liferay/asset/auto/tagger/web/internal/configuration/admin/display/AssetAutoTaggerSiteSettingsConfigurationScreenWrapper.java
+++ b/modules/apps/asset/asset-auto-tagger-web/src/main/java/com/liferay/asset/auto/tagger/web/internal/configuration/admin/display/AssetAutoTaggerSiteSettingsConfigurationScreenWrapper.java
@@ -16,11 +16,11 @@
import com.liferay.site.settings.configuration.admin.display.SiteSettingsConfigurationScreenContributor;
import com.liferay.site.settings.configuration.admin.display.SiteSettingsConfigurationScreenFactory;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-browser-web/build.gradle b/modules/apps/asset/asset-browser-web/build.gradle
index 4bf79da717fc9f..bd319b18f344fe 100644
--- a/modules/apps/asset/asset-browser-web/build.gradle
+++ b/modules/apps/asset/asset-browser-web/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-api")
compileOnly project(":apps:depot:depot-api")
diff --git a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/display/context/AssetBrowserDisplayContext.java b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/display/context/AssetBrowserDisplayContext.java
index 929d00b93bf95a..d977293d1e2e40 100644
--- a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/display/context/AssetBrowserDisplayContext.java
+++ b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/display/context/AssetBrowserDisplayContext.java
@@ -30,13 +30,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/frontend/taglib/clay/servlet/taglib/AssetEntryVerticalCard.java b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/frontend/taglib/clay/servlet/taglib/AssetEntryVerticalCard.java
index 541f6b4680c627..efaa2dcd39125e 100644
--- a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/frontend/taglib/clay/servlet/taglib/AssetEntryVerticalCard.java
+++ b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/frontend/taglib/clay/servlet/taglib/AssetEntryVerticalCard.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.portlet.RenderRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemDescriptor.java b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemDescriptor.java
index 60492d9fa89d43..848a2a1e4c0c80 100644
--- a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemDescriptor.java
+++ b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemDescriptor.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Date;
-import java.util.Locale;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.Locale;
/**
* @author Barbara Cabrera
diff --git a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorView.java b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorView.java
index fc772524f0a35a..34c03d03dcff8f 100644
--- a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorView.java
+++ b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorView.java
@@ -17,21 +17,21 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorViewDescriptor.java b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorViewDescriptor.java
index a6e371cffc4da2..86a7718e8c741c 100644
--- a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorViewDescriptor.java
+++ b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/item/selector/AssetEntryItemSelectorViewDescriptor.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.util.HtmlUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Barbara Cabrera
diff --git a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/search/AddAssetEntryChecker.java b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/search/AddAssetEntryChecker.java
index d36d0baa529942..bca26aec10d2d2 100644
--- a/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/search/AddAssetEntryChecker.java
+++ b/modules/apps/asset/asset-browser-web/src/main/java/com/liferay/asset/browser/web/internal/search/AddAssetEntryChecker.java
@@ -8,7 +8,7 @@
import com.liferay.asset.kernel.model.AssetEntry;
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderResponse;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-categories-admin-web/build.gradle b/modules/apps/asset/asset-categories-admin-web/build.gradle
index e76f620c7a1a96..2881f00222955b 100644
--- a/modules/apps/asset/asset-categories-admin-web/build.gradle
+++ b/modules/apps/asset/asset-categories-admin-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/application/list/AssetCategoriesPanelApp.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/application/list/AssetCategoriesPanelApp.java
index 7305b9e447023f..3cba7773f5d2b6 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/application/list/AssetCategoriesPanelApp.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/application/list/AssetCategoriesPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/change/tracking/spi/display/AssetCategoryCTDisplayRenderer.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/change/tracking/spi/display/AssetCategoryCTDisplayRenderer.java
index d840cbb01c1544..7549c50e067f50 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/change/tracking/spi/display/AssetCategoryCTDisplayRenderer.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/change/tracking/spi/display/AssetCategoryCTDisplayRenderer.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/change/tracking/spi/display/AssetVocabularyCTDisplayRenderer.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/change/tracking/spi/display/AssetVocabularyCTDisplayRenderer.java
index 0e1dd398da38c3..c6096aee44dbf7 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/change/tracking/spi/display/AssetVocabularyCTDisplayRenderer.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/change/tracking/spi/display/AssetVocabularyCTDisplayRenderer.java
@@ -29,11 +29,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/AssetCategoriesDisplayContext.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/AssetCategoriesDisplayContext.java
index 137e5964c34045..f507903655063d 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/AssetCategoriesDisplayContext.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/AssetCategoriesDisplayContext.java
@@ -79,18 +79,18 @@
import com.liferay.portlet.asset.util.comparator.AssetCategoryCreateDateComparator;
import com.liferay.portlet.asset.util.comparator.AssetVocabularyCreateDateComparator;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Juergen Kappler
*/
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/AssetCategoriesManagementToolbarDisplayContext.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/AssetCategoriesManagementToolbarDisplayContext.java
index 2e3e67bd2623fb..c4867af4d69334 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/AssetCategoriesManagementToolbarDisplayContext.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/AssetCategoriesManagementToolbarDisplayContext.java
@@ -31,12 +31,12 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/EditVocabularySettingsDisplayContext.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/EditVocabularySettingsDisplayContext.java
index 3db7c3eb4b5f02..9236a478290461 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/EditVocabularySettingsDisplayContext.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/display/context/EditVocabularySettingsDisplayContext.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.asset.util.AssetVocabularySettingsHelper;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Víctor Galán
*/
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/exportimport/data/handler/AssetCategoryPortletDataHandler.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/exportimport/data/handler/AssetCategoryPortletDataHandler.java
index d9ebb777e4654f..71c0f63e943b71 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/exportimport/data/handler/AssetCategoryPortletDataHandler.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/exportimport/data/handler/AssetCategoryPortletDataHandler.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.module.framework.ModuleServiceLifecycle;
import com.liferay.portal.kernel.xml.Element;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -34,7 +34,7 @@
* @author Máté Thurzó
*/
@Component(
- property = "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ property = "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
service = PortletDataHandler.class
)
public class AssetCategoryPortletDataHandler extends BasePortletDataHandler {
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/frontend/taglib/servlet/taglib/CategoryDetailsScreenNavigationEntry.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/frontend/taglib/servlet/taglib/CategoryDetailsScreenNavigationEntry.java
index 4f92404e13ba45..c34277deefdeb9 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/frontend/taglib/servlet/taglib/CategoryDetailsScreenNavigationEntry.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/frontend/taglib/servlet/taglib/CategoryDetailsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/frontend/taglib/servlet/taglib/CategoryPropertiesScreenNavigationEntry.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/frontend/taglib/servlet/taglib/CategoryPropertiesScreenNavigationEntry.java
index 5c6f671cc55fcd..cbd78ec8dacddd 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/frontend/taglib/servlet/taglib/CategoryPropertiesScreenNavigationEntry.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/frontend/taglib/servlet/taglib/CategoryPropertiesScreenNavigationEntry.java
@@ -10,10 +10,10 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.model.User;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/info/display/url/provider/AssetCategoryInfoEditURLProvider.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/info/display/url/provider/AssetCategoryInfoEditURLProvider.java
index 41e18d52a3b005..69e646f6b7e8f9 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/info/display/url/provider/AssetCategoryInfoEditURLProvider.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/info/display/url/provider/AssetCategoryInfoEditURLProvider.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/info/item/renderer/AssetCategoryTitleInfoItemRenderer.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/info/item/renderer/AssetCategoryTitleInfoItemRenderer.java
index fac0b9166fe862..9acf67b7d93676 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/info/item/renderer/AssetCategoryTitleInfoItemRenderer.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/info/item/renderer/AssetCategoryTitleInfoItemRenderer.java
@@ -10,12 +10,12 @@
import com.liferay.info.item.renderer.InfoItemRenderer;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/item/selector/AssetVocabularyItemSelectorView.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/item/selector/AssetVocabularyItemSelectorView.java
index bfc6e40d9616e5..e37417807d697a 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/item/selector/AssetVocabularyItemSelectorView.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/item/selector/AssetVocabularyItemSelectorView.java
@@ -13,21 +13,21 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.JavaConstants;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/AssetCategoryAdminPortlet.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/AssetCategoryAdminPortlet.java
index b80b1021ad6f17..2e2f4cb1f67be0 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/AssetCategoryAdminPortlet.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/AssetCategoryAdminPortlet.java
@@ -30,15 +30,15 @@
import com.liferay.portal.kernel.security.auth.PrincipalException;
import com.liferay.portal.kernel.servlet.SessionErrors;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.io.IOException;
import java.util.Map;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
@@ -59,13 +59,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Asset Category Admin",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Asset Category Admin",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetCategoryMVCActionCommand.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetCategoryMVCActionCommand.java
index 2f6ecc9e518916..ca88b5f203fe80 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetCategoryMVCActionCommand.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetCategoryMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/asset_categories_admin/delete_asset_category"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetVocabulariesMVCResourceCommand.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetVocabulariesMVCResourceCommand.java
index 2f6a276f51b071..64ac4a5a29fd7a 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetVocabulariesMVCResourceCommand.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetVocabulariesMVCResourceCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/asset_categories_admin/delete_asset_vocabularies"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetVocabularyMVCActionCommand.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetVocabularyMVCActionCommand.java
index ab876cb019ecc1..7209d2164b0352 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetVocabularyMVCActionCommand.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/DeleteAssetVocabularyMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/asset_categories_admin/delete_asset_vocabulary"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetCategoryMVCActionCommand.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetCategoryMVCActionCommand.java
index 4cddc177af5ea2..e0d51cccc2869a 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetCategoryMVCActionCommand.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetCategoryMVCActionCommand.java
@@ -26,13 +26,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,7 +41,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/asset_categories_admin/edit_asset_category"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetCategoryPropertiesMVCActionCommand.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetCategoryPropertiesMVCActionCommand.java
index db30fbce91364d..92a92857f02a82 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetCategoryPropertiesMVCActionCommand.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetCategoryPropertiesMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/asset_categories_admin/edit_asset_category_properties"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetVocabularyMVCActionCommand.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetVocabularyMVCActionCommand.java
index ea7431480592e2..6e4a774c6c75a3 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetVocabularyMVCActionCommand.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/EditAssetVocabularyMVCActionCommand.java
@@ -31,13 +31,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.asset.util.AssetVocabularySettingsHelper;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,7 +46,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/asset_categories_admin/edit_asset_vocabulary"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/MoveAssetCategoryMVCActionCommand.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/MoveAssetCategoryMVCActionCommand.java
index 5976aefa484eae..429e3b167c6131 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/MoveAssetCategoryMVCActionCommand.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/MoveAssetCategoryMVCActionCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.service.ServiceContextFactory;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/asset_categories_admin/move_asset_category"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/SetAssetCategoryDisplayPageTemplateMVCActionCommand.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/SetAssetCategoryDisplayPageTemplateMVCActionCommand.java
index 05a9fcc7a96672..4d2a6a4e7c3a8f 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/SetAssetCategoryDisplayPageTemplateMVCActionCommand.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/action/SetAssetCategoryDisplayPageTemplateMVCActionCommand.java
@@ -14,10 +14,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Date;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Date;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/asset_categories_admin/set_asset_category_display_page_template"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
index a78a7c951d4210..d6c6235820daf9 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
@@ -22,8 +22,8 @@
import com.liferay.portlet.asset.service.permission.AssetCategoriesPermission;
import com.liferay.taglib.security.PermissionsURLTag;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
+ property = "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN,
service = PortletConfigurationIcon.class
)
public class PermissionsPortletConfigurationIcon
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/route/AssetCategoryAdminFriendlyURLMapper.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/route/AssetCategoryAdminFriendlyURLMapper.java
index fdc6ecf226f2c3..80fcbb88926c28 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/route/AssetCategoryAdminFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/portlet/route/AssetCategoryAdminFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN
+ "jakarta.portlet.name=" + AssetCategoriesAdminPortletKeys.ASSET_CATEGORIES_ADMIN
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/servlet/taglib/util/AssetCategoryActionDropdownItemsProvider.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/servlet/taglib/util/AssetCategoryActionDropdownItemsProvider.java
index c07fbf2cd3af0d..6f2efdf923f272 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/servlet/taglib/util/AssetCategoryActionDropdownItemsProvider.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/servlet/taglib/util/AssetCategoryActionDropdownItemsProvider.java
@@ -41,12 +41,12 @@
import com.liferay.portlet.asset.service.permission.AssetCategoryPermission;
import com.liferay.taglib.security.PermissionsURLTag;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Víctor Galán
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/servlet/taglib/util/AssetVocabularyActionDropdownItemsProvider.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/servlet/taglib/util/AssetVocabularyActionDropdownItemsProvider.java
index 9523fb573890a4..28e68bfc802d9e 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/servlet/taglib/util/AssetVocabularyActionDropdownItemsProvider.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/servlet/taglib/util/AssetVocabularyActionDropdownItemsProvider.java
@@ -20,11 +20,11 @@
import com.liferay.portlet.asset.service.permission.AssetVocabularyPermission;
import com.liferay.taglib.security.PermissionsURLTag;
-import java.util.List;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Víctor Galán
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/util/AssetCategoryUtil.java b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/util/AssetCategoryUtil.java
index bdf0e772918ca4..05e1dc4ccde85c 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/util/AssetCategoryUtil.java
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/java/com/liferay/asset/categories/admin/web/internal/util/AssetCategoryUtil.java
@@ -17,12 +17,12 @@
import com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntryBuilder;
import com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntryListBuilder;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-categories-admin-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-categories-admin-web/src/main/resources/META-INF/resources/init.jsp
index fec3ba63e81eaf..ac3bd2f176316b 100644
--- a/modules/apps/asset/asset-categories-admin-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/asset/asset-categories-admin-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -69,14 +69,14 @@ page import="com.liferay.portal.kernel.util.StringUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntriesUtil" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.util.ArrayList" %><%@
page import="java.util.Collections" %><%@
page import="java.util.List" %><%@
page import="java.util.Map" %><%@
page import="java.util.Objects" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/asset/asset-categories-item-selector-web/build.gradle b/modules/apps/asset/asset-categories-item-selector-web/build.gradle
index d66974043262f3..9d5c0ac0b27850 100644
--- a/modules/apps/asset/asset-categories-item-selector-web/build.gradle
+++ b/modules/apps/asset/asset-categories-item-selector-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-categories-admin-web-api")
diff --git a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/AssetCategoryInfoItemItemSelectorView.java b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/AssetCategoryInfoItemItemSelectorView.java
index fe1db6301b6282..855fa3165bceb7 100644
--- a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/AssetCategoryInfoItemItemSelectorView.java
+++ b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/AssetCategoryInfoItemItemSelectorView.java
@@ -16,22 +16,22 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.JavaConstants;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/AssetCategoryTreeNodeItemSelectorView.java b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/AssetCategoryTreeNodeItemSelectorView.java
index 3f4a3a42f874f6..82e6bf6fd18524 100644
--- a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/AssetCategoryTreeNodeItemSelectorView.java
+++ b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/AssetCategoryTreeNodeItemSelectorView.java
@@ -14,21 +14,21 @@
import com.liferay.item.selector.ItemSelectorView;
import com.liferay.portal.kernel.language.Language;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetCategoryInfoItemDisplayContext.java b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetCategoryInfoItemDisplayContext.java
index df925cc546af98..58a8ce8cfc755d 100644
--- a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetCategoryInfoItemDisplayContext.java
+++ b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetCategoryInfoItemDisplayContext.java
@@ -41,16 +41,16 @@
import com.liferay.portlet.asset.service.permission.AssetCategoryPermission;
import com.liferay.portlet.asset.util.comparator.AssetVocabularyGroupLocalizedTitleComparator;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetCategoryTreeNodeDisplayContext.java b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetCategoryTreeNodeDisplayContext.java
index 82c00aefab2b87..c6da713ee77a05 100644
--- a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetCategoryTreeNodeDisplayContext.java
+++ b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetCategoryTreeNodeDisplayContext.java
@@ -28,18 +28,18 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntryListBuilder;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Rubén Pulido
*/
diff --git a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetVocabularyDisplayContext.java b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetVocabularyDisplayContext.java
index 9c4eface6e1caa..251438f6229723 100644
--- a/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetVocabularyDisplayContext.java
+++ b/modules/apps/asset/asset-categories-item-selector-web/src/main/java/com/liferay/asset/categories/item/selector/web/internal/display/context/SelectAssetVocabularyDisplayContext.java
@@ -26,15 +26,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntryListBuilder;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Rubén Pulido
diff --git a/modules/apps/asset/asset-categories-item-selector-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-categories-item-selector-web/src/main/resources/META-INF/resources/init.jsp
index 75e78bf90b3ca4..d7d31908ff8a3a 100644
--- a/modules/apps/asset/asset-categories-item-selector-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/asset/asset-categories-item-selector-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-categories-navigation-web/build.gradle b/modules/apps/asset/asset-categories-navigation-web/build.gradle
index 447a27eb0f0edd..6d19efd64ca26f 100644
--- a/modules/apps/asset/asset-categories-navigation-web/build.gradle
+++ b/modules/apps/asset/asset-categories-navigation-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-categories-navigation-api")
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/display/context/AssetCategoriesNavigationDisplayContext.java b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/display/context/AssetCategoriesNavigationDisplayContext.java
index a8ac0bdff9be6b..3a24e525284606 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/display/context/AssetCategoriesNavigationDisplayContext.java
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/display/context/AssetCategoriesNavigationDisplayContext.java
@@ -31,13 +31,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/exportimport/data/handler/AssetCategoriesNavigationPortletDataHandler.java b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/exportimport/data/handler/AssetCategoriesNavigationPortletDataHandler.java
index d2b52568c1180d..71588a305fac02 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/exportimport/data/handler/AssetCategoriesNavigationPortletDataHandler.java
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/exportimport/data/handler/AssetCategoriesNavigationPortletDataHandler.java
@@ -19,7 +19,7 @@
* @author Julio Camarero
*/
@Component(
- property = "javax.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
+ property = "jakarta.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
service = PortletDataHandler.class
)
public class AssetCategoriesNavigationPortletDataHandler
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/exportimport/portlet/preferences/processor/AssetCategoriesNavigationPortletPreferencesProcessor.java b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/exportimport/portlet/preferences/processor/AssetCategoriesNavigationPortletPreferencesProcessor.java
index 74c56c9f408fbd..a42e226ffb398e 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/exportimport/portlet/preferences/processor/AssetCategoriesNavigationPortletPreferencesProcessor.java
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/exportimport/portlet/preferences/processor/AssetCategoriesNavigationPortletPreferencesProcessor.java
@@ -25,13 +25,13 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletPreferences;
+
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
* @author Máté Thurzó
*/
@Component(
- property = "javax.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
+ property = "jakarta.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
service = ExportImportPortletPreferencesProcessor.class
)
public class AssetCategoriesNavigationPortletPreferencesProcessor
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/AssetCategoriesNavigationPortlet.java b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/AssetCategoriesNavigationPortlet.java
index c19763fd6d8132..d599821f8b36cf 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/AssetCategoriesNavigationPortlet.java
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/AssetCategoriesNavigationPortlet.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.model.Release;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -31,16 +31,16 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Categories Navigation",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.supported-public-render-parameter=categoryId",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Categories Navigation",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=categoryId",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/action/AssetCategoriesNavigationConfigurationAction.java b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/action/AssetCategoriesNavigationConfigurationAction.java
index 3dcc57084bb046..0dc00db478602d 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/action/AssetCategoriesNavigationConfigurationAction.java
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/action/AssetCategoriesNavigationConfigurationAction.java
@@ -21,17 +21,17 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.ReadOnlyException;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.ReadOnlyException;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
+ property = "jakarta.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
service = ConfigurationAction.class
)
public class AssetCategoriesNavigationConfigurationAction
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/display/template/AssetCategoriesNavigationPortletDisplayTemplateHandler.java b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/display/template/AssetCategoriesNavigationPortletDisplayTemplateHandler.java
index 5b8d414a3a489f..f0b7f08b991216 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/display/template/AssetCategoriesNavigationPortletDisplayTemplateHandler.java
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/display/template/AssetCategoriesNavigationPortletDisplayTemplateHandler.java
@@ -31,7 +31,7 @@
* @author Juan Fernández
*/
@Component(
- property = "javax.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
+ property = "jakarta.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION,
service = TemplateHandler.class
)
public class AssetCategoriesNavigationPortletDisplayTemplateHandler
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/route/AssetCategoriesNavigationFriendlyURLMapper.java b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/route/AssetCategoriesNavigationFriendlyURLMapper.java
index 0655209188dc40..9ebf0b6f07973b 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/route/AssetCategoriesNavigationFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/portlet/route/AssetCategoriesNavigationFriendlyURLMapper.java
@@ -24,7 +24,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION
+ "jakarta.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/upgrade/v1_0_2/UpgradePortletPreferences.java b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/upgrade/v1_0_2/UpgradePortletPreferences.java
index 4bb3d4348bbb7e..a06979e0f3ee7a 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/upgrade/v1_0_2/UpgradePortletPreferences.java
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/java/com/liferay/asset/categories/navigation/web/internal/upgrade/v1_0_2/UpgradePortletPreferences.java
@@ -14,13 +14,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portlet.display.template.upgrade.BaseUpgradePortletPreferences;
+import jakarta.portlet.PortletPreferences;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-
/**
* @author Mikel Lorza
*/
diff --git a/modules/apps/asset/asset-categories-navigation-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-categories-navigation-web/src/main/resources/META-INF/resources/init.jsp
index 39a38c9f5d78ce..f273be72a6231c 100644
--- a/modules/apps/asset/asset-categories-navigation-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/asset/asset-categories-navigation-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-categories-service/build.gradle b/modules/apps/asset/asset-categories-service/build.gradle
index 91385964daea55..eab07520f0295f 100644
--- a/modules/apps/asset/asset-categories-service/build.gradle
+++ b/modules/apps/asset/asset-categories-service/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-categories-api")
diff --git a/modules/apps/asset/asset-categories-service/src/main/java/com/liferay/asset/categories/internal/struts/GetCategoriesStrutsAction.java b/modules/apps/asset/asset-categories-service/src/main/java/com/liferay/asset/categories/internal/struts/GetCategoriesStrutsAction.java
index 83307d739487b5..8c349ab8719c64 100644
--- a/modules/apps/asset/asset-categories-service/src/main/java/com/liferay/asset/categories/internal/struts/GetCategoriesStrutsAction.java
+++ b/modules/apps/asset/asset-categories-service/src/main/java/com/liferay/asset/categories/internal/struts/GetCategoriesStrutsAction.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.struts.StrutsAction;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-categories-test/build.gradle b/modules/apps/asset/asset-categories-test/build.gradle
index 991a31e9612048..232e9ddd1ece9a 100644
--- a/modules/apps/asset/asset-categories-test/build.gradle
+++ b/modules/apps/asset/asset-categories-test/build.gradle
@@ -1,6 +1,6 @@
dependencies {
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
testIntegrationImplementation project(":apps:asset:asset-categories-admin-web-api")
testIntegrationImplementation project(":apps:asset:asset-categories-api")
testIntegrationImplementation project(":apps:asset:asset-categories-navigation-api")
diff --git a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/admin/web/internal/portlet/test/AssetCategoryAdminPortletTest.java b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/admin/web/internal/portlet/test/AssetCategoryAdminPortletTest.java
index b23ca823902de8..014ad4256403f3 100644
--- a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/admin/web/internal/portlet/test/AssetCategoryAdminPortletTest.java
+++ b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/admin/web/internal/portlet/test/AssetCategoryAdminPortletTest.java
@@ -42,13 +42,13 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Portlet;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/exportimport/portlet/preferences/processor/test/AssetCategoriesNavigationPortletPreferencesProcessorTest.java b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/exportimport/portlet/preferences/processor/test/AssetCategoriesNavigationPortletPreferencesProcessorTest.java
index 4b17840d9066da..33e8739625a5cd 100644
--- a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/exportimport/portlet/preferences/processor/test/AssetCategoriesNavigationPortletPreferencesProcessorTest.java
+++ b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/exportimport/portlet/preferences/processor/test/AssetCategoriesNavigationPortletPreferencesProcessorTest.java
@@ -25,9 +25,9 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
-import java.util.HashMap;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.HashMap;
import org.junit.Assert;
import org.junit.Before;
@@ -129,7 +129,7 @@ public void testProcessAssetVocabularyExternalReferenceCode()
}
@Inject(
- filter = "javax.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION
+ filter = "jakarta.portlet.name=" + AssetCategoriesNavigationPortletKeys.ASSET_CATEGORIES_NAVIGATION
)
private ExportImportPortletPreferencesProcessor
_exportImportPortletPreferencesProcessor;
diff --git a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/info/collection/provider/test/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProviderTest.java b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/info/collection/provider/test/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProviderTest.java
index 97e56ccf33fd43..6d2378d3b51aa9 100644
--- a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/info/collection/provider/test/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProviderTest.java
+++ b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/info/collection/provider/test/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProviderTest.java
@@ -40,9 +40,9 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/navigation/web/internal/upgrade/v1_0_2/test/UpgradePortletPreferencesTest.java b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/navigation/web/internal/upgrade/v1_0_2/test/UpgradePortletPreferencesTest.java
index c65ca3e55cc954..61961594e597f7 100644
--- a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/navigation/web/internal/upgrade/v1_0_2/test/UpgradePortletPreferencesTest.java
+++ b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/navigation/web/internal/upgrade/v1_0_2/test/UpgradePortletPreferencesTest.java
@@ -34,11 +34,11 @@
import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
import com.liferay.portal.upgrade.test.util.UpgradeTestUtil;
+import jakarta.portlet.PortletPreferences;
+
import java.util.HashMap;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/service/test/TestAssetIndexer.java b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/service/test/TestAssetIndexer.java
index 215ab220854943..58a849cf7b029a 100644
--- a/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/service/test/TestAssetIndexer.java
+++ b/modules/apps/asset/asset-categories-test/src/testIntegration/java/com/liferay/asset/categories/service/test/TestAssetIndexer.java
@@ -10,10 +10,10 @@
import com.liferay.portal.kernel.search.Document;
import com.liferay.portal.kernel.search.Summary;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.junit.Assert;
diff --git a/modules/apps/asset/asset-display-page-api/build.gradle b/modules/apps/asset/asset-display-page-api/build.gradle
index 8d2b8cd3db2d9f..4059fd3171187a 100644
--- a/modules/apps/asset/asset-display-page-api/build.gradle
+++ b/modules/apps/asset/asset-display-page-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/layout/asset/entry/provider/LayoutAssetEntryProvider.java b/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/layout/asset/entry/provider/LayoutAssetEntryProvider.java
index 3afc5feec9617d..51b61c7e9dfc51 100644
--- a/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/layout/asset/entry/provider/LayoutAssetEntryProvider.java
+++ b/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/layout/asset/entry/provider/LayoutAssetEntryProvider.java
@@ -8,7 +8,7 @@
import com.liferay.asset.kernel.model.AssetEntry;
import com.liferay.portal.kernel.model.Layout;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Roberto Díaz
diff --git a/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/portlet/AssetDisplayPageEntryFormProcessor.java b/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/portlet/AssetDisplayPageEntryFormProcessor.java
index 67f6265688f729..0d3a557fda419d 100644
--- a/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/portlet/AssetDisplayPageEntryFormProcessor.java
+++ b/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/portlet/AssetDisplayPageEntryFormProcessor.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.service.ServiceContext;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/portlet/BaseAssetDisplayPageFriendlyURLResolver.java b/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/portlet/BaseAssetDisplayPageFriendlyURLResolver.java
index 4f2a467f53c643..8c32effa35e9ba 100644
--- a/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/portlet/BaseAssetDisplayPageFriendlyURLResolver.java
+++ b/modules/apps/asset/asset-display-page-api/src/main/java/com/liferay/asset/display/page/portlet/BaseAssetDisplayPageFriendlyURLResolver.java
@@ -55,15 +55,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.osgi.service.component.annotations.Reference;
/**
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/build.gradle b/modules/apps/asset/asset-display-page-item-selector-web/build.gradle
index 80b36a12a6ebbf..ae5383c42f8040 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/build.gradle
+++ b/modules/apps/asset/asset-display-page-item-selector-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-display-page-item-selector-api")
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/AssetDisplayPagesItemSelectorCustomView.java b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/AssetDisplayPagesItemSelectorCustomView.java
index 2427be284b8a19..c38184b4d3e56c 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/AssetDisplayPagesItemSelectorCustomView.java
+++ b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/AssetDisplayPagesItemSelectorCustomView.java
@@ -12,21 +12,21 @@
import com.liferay.item.selector.criteria.UUIDItemSelectorReturnType;
import com.liferay.portal.kernel.language.Language;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorCustomViewDisplayContext.java b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorCustomViewDisplayContext.java
index e9d732a2a02afe..70ba496b7e6980 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorCustomViewDisplayContext.java
+++ b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorCustomViewDisplayContext.java
@@ -31,13 +31,13 @@
import com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntryBuilder;
import com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntryListBuilder;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
/**
* @author Yurena Cabrera
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorCustomViewManagementToolbarDisplayContext.java b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorCustomViewManagementToolbarDisplayContext.java
index 802eafbe602b5f..b420e458f03b59 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorCustomViewManagementToolbarDisplayContext.java
+++ b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorCustomViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Yurena Cabrera
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorViewDisplayContext.java b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorViewDisplayContext.java
index c62ff75d00b21f..1174ce202c37e5 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorViewDisplayContext.java
+++ b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/display/context/AssetDisplayPagesItemSelectorViewDisplayContext.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/frontend/taglib/clay/servlet/taglib/LayoutPageTemplateEntryVerticalCard.java b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/frontend/taglib/clay/servlet/taglib/LayoutPageTemplateEntryVerticalCard.java
index a407806e355d1d..d24aea6fc7a30c 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/frontend/taglib/clay/servlet/taglib/LayoutPageTemplateEntryVerticalCard.java
+++ b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/frontend/taglib/clay/servlet/taglib/LayoutPageTemplateEntryVerticalCard.java
@@ -10,11 +10,11 @@
import com.liferay.portal.kernel.language.LanguageUtil;
import com.liferay.portal.kernel.util.PortalUtil;
-import java.util.Date;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/item/selector/AssetDisplayPageItemDescriptor.java b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/item/selector/AssetDisplayPageItemDescriptor.java
index 24bc3aab8f0be3..3f93e9df75e547 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/item/selector/AssetDisplayPageItemDescriptor.java
+++ b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/item/selector/AssetDisplayPageItemDescriptor.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.dao.search.RowChecker;
import com.liferay.portal.kernel.json.JSONUtil;
-import java.util.Locale;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import java.util.Locale;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/item/selector/AssetDisplayPageItemSelectorViewDescriptor.java b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/item/selector/AssetDisplayPageItemSelectorViewDescriptor.java
index bf5b41d92de0a8..32d4fd88bb2170 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/item/selector/AssetDisplayPageItemSelectorViewDescriptor.java
+++ b/modules/apps/asset/asset-display-page-item-selector-web/src/main/java/com/liferay/asset/display/page/item/selector/web/internal/item/selector/AssetDisplayPageItemSelectorViewDescriptor.java
@@ -13,7 +13,7 @@
import com.liferay.portal.kernel.dao.search.SearchContainer;
import com.liferay.portal.kernel.exception.PortalException;
-import javax.portlet.PortletException;
+import jakarta.portlet.PortletException;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-display-page-item-selector-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-display-page-item-selector-web/src/main/resources/META-INF/resources/init.jsp
index dbee8aa54e4f15..0285c6c18041d4 100644
--- a/modules/apps/asset/asset-display-page-item-selector-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/asset/asset-display-page-item-selector-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-display-page-service/build.gradle b/modules/apps/asset/asset-display-page-service/build.gradle
index 9f42577cada269..10c54be14f45fd 100644
--- a/modules/apps/asset/asset-display-page-service/build.gradle
+++ b/modules/apps/asset/asset-display-page-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/asset/asset-display-page-service/src/main/java/com/liferay/asset/display/page/internal/layout/asset/entry/provider/LayoutAssetEntryProviderRegistryImpl.java b/modules/apps/asset/asset-display-page-service/src/main/java/com/liferay/asset/display/page/internal/layout/asset/entry/provider/LayoutAssetEntryProviderRegistryImpl.java
index b4e40487e7deb6..068d364a9858ee 100644
--- a/modules/apps/asset/asset-display-page-service/src/main/java/com/liferay/asset/display/page/internal/layout/asset/entry/provider/LayoutAssetEntryProviderRegistryImpl.java
+++ b/modules/apps/asset/asset-display-page-service/src/main/java/com/liferay/asset/display/page/internal/layout/asset/entry/provider/LayoutAssetEntryProviderRegistryImpl.java
@@ -35,7 +35,7 @@ public LayoutAssetEntryProvider getLayoutAssetEntryProvider(
protected void activate(BundleContext bundleContext) {
_serviceTrackerMap = ServiceTrackerMapFactory.openSingleValueMap(
bundleContext, LayoutAssetEntryProvider.class,
- "javax.portlet.name");
+ "jakarta.portlet.name");
}
@Deactivate
diff --git a/modules/apps/asset/asset-display-page-service/src/main/java/com/liferay/asset/display/page/internal/portlet/CustomAssetDisplayPageFriendlyURLResolver.java b/modules/apps/asset/asset-display-page-service/src/main/java/com/liferay/asset/display/page/internal/portlet/CustomAssetDisplayPageFriendlyURLResolver.java
index 14c110ce261ad6..6bed9a584e7606 100644
--- a/modules/apps/asset/asset-display-page-service/src/main/java/com/liferay/asset/display/page/internal/portlet/CustomAssetDisplayPageFriendlyURLResolver.java
+++ b/modules/apps/asset/asset-display-page-service/src/main/java/com/liferay/asset/display/page/internal/portlet/CustomAssetDisplayPageFriendlyURLResolver.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
/**
diff --git a/modules/apps/asset/asset-display-page-service/src/test/java/com/liferay/asset/display/page/internal/portlet/CustomAssetDisplayPageFriendlyURLResolverTest.java b/modules/apps/asset/asset-display-page-service/src/test/java/com/liferay/asset/display/page/internal/portlet/CustomAssetDisplayPageFriendlyURLResolverTest.java
index 628bca33d5f150..42d98c6a4e582f 100644
--- a/modules/apps/asset/asset-display-page-service/src/test/java/com/liferay/asset/display/page/internal/portlet/CustomAssetDisplayPageFriendlyURLResolverTest.java
+++ b/modules/apps/asset/asset-display-page-service/src/test/java/com/liferay/asset/display/page/internal/portlet/CustomAssetDisplayPageFriendlyURLResolverTest.java
@@ -30,9 +30,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.test.rule.LiferayUnitTestRule;
-import java.util.Collections;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
import org.junit.AfterClass;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-display-web/build.gradle b/modules/apps/asset/asset-display-web/build.gradle
index a53234f0c71152..3c770f43ef8237 100644
--- a/modules/apps/asset/asset-display-web/build.gradle
+++ b/modules/apps/asset/asset-display-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-taglib")
compileOnly project(":apps:frontend-taglib:frontend-taglib")
diff --git a/modules/apps/asset/asset-display-web/src/main/java/com/liferay/asset/display/web/internal/display/context/AssetDisplayDisplayContext.java b/modules/apps/asset/asset-display-web/src/main/java/com/liferay/asset/display/web/internal/display/context/AssetDisplayDisplayContext.java
index c6e95a2fb58d96..92ed28fc966e5c 100644
--- a/modules/apps/asset/asset-display-web/src/main/java/com/liferay/asset/display/web/internal/display/context/AssetDisplayDisplayContext.java
+++ b/modules/apps/asset/asset-display-web/src/main/java/com/liferay/asset/display/web/internal/display/context/AssetDisplayDisplayContext.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-display-web/src/main/java/com/liferay/asset/display/web/internal/portlet/AssetDisplayPortlet.java b/modules/apps/asset/asset-display-web/src/main/java/com/liferay/asset/display/web/internal/portlet/AssetDisplayPortlet.java
index 518b5d87d59be6..d9e414fa00e019 100644
--- a/modules/apps/asset/asset-display-web/src/main/java/com/liferay/asset/display/web/internal/portlet/AssetDisplayPortlet.java
+++ b/modules/apps/asset/asset-display-web/src/main/java/com/liferay/asset/display/web/internal/portlet/AssetDisplayPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.asset.display.web.internal.constants.AssetDisplayPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -24,13 +24,13 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.system=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Asset Display",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetDisplayPortletKeys.ASSET_DISPLAY,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Asset Display",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetDisplayPortletKeys.ASSET_DISPLAY,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/build.gradle b/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/build.gradle
index 670716a936cde4..ec8fe806a9d23a 100644
--- a/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/build.gradle
+++ b/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-api")
compileOnly project(":apps:asset:asset-publisher-api")
diff --git a/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/src/main/java/com/liferay/asset/entry/query/processor/custom/user/attributes/internal/CustomUserAttributesAssetEntryQueryProcessor.java b/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/src/main/java/com/liferay/asset/entry/query/processor/custom/user/attributes/internal/CustomUserAttributesAssetEntryQueryProcessor.java
index 37ef404c119292..c00edfc4d3ca38 100644
--- a/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/src/main/java/com/liferay/asset/entry/query/processor/custom/user/attributes/internal/CustomUserAttributesAssetEntryQueryProcessor.java
+++ b/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/src/main/java/com/liferay/asset/entry/query/processor/custom/user/attributes/internal/CustomUserAttributesAssetEntryQueryProcessor.java
@@ -25,6 +25,8 @@
import com.liferay.portal.kernel.util.PrimitiveLongList;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.PortletPreferences;
+
import java.io.Serializable;
import java.util.List;
@@ -32,8 +34,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,7 +41,7 @@
* @author Jorge Ferrer
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = AssetEntryQueryProcessor.class
)
public class CustomUserAttributesAssetEntryQueryProcessor
diff --git a/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/src/main/java/com/liferay/asset/entry/query/processor/custom/user/attributes/internal/frontend/taglib/form/navigator/CustomUserAttributesFormNavigatorEntry.java b/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/src/main/java/com/liferay/asset/entry/query/processor/custom/user/attributes/internal/frontend/taglib/form/navigator/CustomUserAttributesFormNavigatorEntry.java
index a7db362ffbc0f2..bf345c7fc31bb7 100644
--- a/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/src/main/java/com/liferay/asset/entry/query/processor/custom/user/attributes/internal/frontend/taglib/form/navigator/CustomUserAttributesFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-entry-query-processor-custom-user-attributes/src/main/java/com/liferay/asset/entry/query/processor/custom/user/attributes/internal/frontend/taglib/form/navigator/CustomUserAttributesFormNavigatorEntry.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.GetterUtil;
-import java.util.Locale;
-import java.util.Objects;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-info-display-api/build.gradle b/modules/apps/asset/asset-info-display-api/build.gradle
index 6664cc0ba1f967..a4684c105fe706 100644
--- a/modules/apps/asset/asset-info-display-api/build.gradle
+++ b/modules/apps/asset/asset-info-display-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/asset/asset-info-display-api/src/main/java/com/liferay/asset/info/display/url/provider/AssetInfoEditURLProvider.java b/modules/apps/asset/asset-info-display-api/src/main/java/com/liferay/asset/info/display/url/provider/AssetInfoEditURLProvider.java
index e29908fc68e06d..886f9c428859f1 100644
--- a/modules/apps/asset/asset-info-display-api/src/main/java/com/liferay/asset/info/display/url/provider/AssetInfoEditURLProvider.java
+++ b/modules/apps/asset/asset-info-display-api/src/main/java/com/liferay/asset/info/display/url/provider/AssetInfoEditURLProvider.java
@@ -5,7 +5,7 @@
package com.liferay.asset.info.display.url.provider;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/asset/asset-info-display-impl/build.gradle b/modules/apps/asset/asset-info-display-impl/build.gradle
index 2cca89286e3e72..38bf5aaac01844 100644
--- a/modules/apps/asset/asset-info-display-impl/build.gradle
+++ b/modules/apps/asset/asset-info-display-impl/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay", name: "org.osgi.service.http.whiteboard", version: "1.1.1.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
- compileOnly group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.1.1"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-api")
compileOnly project(":apps:asset:asset-display-page-api")
diff --git a/modules/apps/asset/asset-info-display-impl/src/main/java/com/liferay/asset/info/display/internal/request/attributes/contributor/AssetInfoDisplayRequestAttributesContributor.java b/modules/apps/asset/asset-info-display-impl/src/main/java/com/liferay/asset/info/display/internal/request/attributes/contributor/AssetInfoDisplayRequestAttributesContributor.java
index 82434b50ebb2c2..c7a331042c1fd6 100644
--- a/modules/apps/asset/asset-info-display-impl/src/main/java/com/liferay/asset/info/display/internal/request/attributes/contributor/AssetInfoDisplayRequestAttributesContributor.java
+++ b/modules/apps/asset/asset-info-display-impl/src/main/java/com/liferay/asset/info/display/internal/request/attributes/contributor/AssetInfoDisplayRequestAttributesContributor.java
@@ -24,7 +24,7 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-info-display-impl/src/main/java/com/liferay/asset/info/display/internal/url/provider/AssetInfoEditURLProviderImpl.java b/modules/apps/asset/asset-info-display-impl/src/main/java/com/liferay/asset/info/display/internal/url/provider/AssetInfoEditURLProviderImpl.java
index 0968c354d0b754..4d0f5464cf32a1 100644
--- a/modules/apps/asset/asset-info-display-impl/src/main/java/com/liferay/asset/info/display/internal/url/provider/AssetInfoEditURLProviderImpl.java
+++ b/modules/apps/asset/asset-info-display-impl/src/main/java/com/liferay/asset/info/display/internal/url/provider/AssetInfoEditURLProviderImpl.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-info-impl/build.gradle b/modules/apps/asset/asset-info-impl/build.gradle
index 9ae1bc086c3ab1..fbf9df4b628505 100644
--- a/modules/apps/asset/asset-info-impl/build.gradle
+++ b/modules/apps/asset/asset-info-impl/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-api")
diff --git a/modules/apps/asset/asset-info-impl/src/main/java/com/liferay/asset/info/internal/item/renderer/AssetEntryTitleInfoItemRenderer.java b/modules/apps/asset/asset-info-impl/src/main/java/com/liferay/asset/info/internal/item/renderer/AssetEntryTitleInfoItemRenderer.java
index 2ffc5607419b04..5c64a8017dcc0a 100644
--- a/modules/apps/asset/asset-info-impl/src/main/java/com/liferay/asset/info/internal/item/renderer/AssetEntryTitleInfoItemRenderer.java
+++ b/modules/apps/asset/asset-info-impl/src/main/java/com/liferay/asset/info/internal/item/renderer/AssetEntryTitleInfoItemRenderer.java
@@ -11,13 +11,13 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-info-impl/src/main/java/com/liferay/asset/info/internal/list/renderer/BaseAssetEntryBasicInfoListRenderer.java b/modules/apps/asset/asset-info-impl/src/main/java/com/liferay/asset/info/internal/list/renderer/BaseAssetEntryBasicInfoListRenderer.java
index d30e039328235d..d5ba69c1f20fab 100644
--- a/modules/apps/asset/asset-info-impl/src/main/java/com/liferay/asset/info/internal/list/renderer/BaseAssetEntryBasicInfoListRenderer.java
+++ b/modules/apps/asset/asset-info-impl/src/main/java/com/liferay/asset/info/internal/list/renderer/BaseAssetEntryBasicInfoListRenderer.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-list-api/build.gradle b/modules/apps/asset/asset-list-api/build.gradle
index 59c67c18134a65..adde5eab676ffc 100644
--- a/modules/apps/asset/asset-list-api/build.gradle
+++ b/modules/apps/asset/asset-list-api/build.gradle
@@ -1,9 +1,9 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/asset/asset-list-item-selector-web/build.gradle b/modules/apps/asset/asset-list-item-selector-web/build.gradle
index 768c887693a57a..5b9c3ddcf79195 100644
--- a/modules/apps/asset/asset-list-item-selector-web/build.gradle
+++ b/modules/apps/asset/asset-list-item-selector-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-list-api")
diff --git a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemDescriptor.java b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemDescriptor.java
index b60799a6772053..d10f6ce261e5ae 100644
--- a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemDescriptor.java
+++ b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemDescriptor.java
@@ -17,11 +17,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemSelectorViewDescriptor.java b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemSelectorViewDescriptor.java
index 3d00ffa13ed145..97f1f9bf51610d 100644
--- a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemSelectorViewDescriptor.java
+++ b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListItemSelectorViewDescriptor.java
@@ -13,7 +13,7 @@
import com.liferay.item.selector.criteria.InfoListItemSelectorReturnType;
import com.liferay.portal.kernel.dao.search.SearchContainer;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListPortletItemSelectorView.java b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListPortletItemSelectorView.java
index b40e65a576c624..9e8299b44fa1be 100644
--- a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListPortletItemSelectorView.java
+++ b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/AssetListPortletItemSelectorView.java
@@ -17,19 +17,19 @@
import com.liferay.item.selector.criteria.InfoListItemSelectorReturnType;
import com.liferay.portal.kernel.language.Language;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/display/context/AssetListEntryItemSelectorDisplayContext.java b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/display/context/AssetListEntryItemSelectorDisplayContext.java
index 8724e7931d2629..e32f11044ca2c4 100644
--- a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/display/context/AssetListEntryItemSelectorDisplayContext.java
+++ b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/display/context/AssetListEntryItemSelectorDisplayContext.java
@@ -36,15 +36,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/frontend/taglib/clay/servlet/taglib/AssetListEntryVerticalCard.java b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/frontend/taglib/clay/servlet/taglib/AssetListEntryVerticalCard.java
index b39ef2d1bc035f..e3ad6f9c8ad2cc 100644
--- a/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/frontend/taglib/clay/servlet/taglib/AssetListEntryVerticalCard.java
+++ b/modules/apps/asset/asset-list-item-selector-web/src/main/java/com/liferay/asset/list/item/selector/web/internal/frontend/taglib/clay/servlet/taglib/AssetListEntryVerticalCard.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.language.LanguageUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-list-item-selector-web/src/test/java/com/liferay/asset/list/item/selector/web/internal/display/context/AssetListEntryItemSelectorDisplayContextTest.java b/modules/apps/asset/asset-list-item-selector-web/src/test/java/com/liferay/asset/list/item/selector/web/internal/display/context/AssetListEntryItemSelectorDisplayContextTest.java
index 1000c7b4412a99..210301f0a3d8ef 100644
--- a/modules/apps/asset/asset-list-item-selector-web/src/test/java/com/liferay/asset/list/item/selector/web/internal/display/context/AssetListEntryItemSelectorDisplayContextTest.java
+++ b/modules/apps/asset/asset-list-item-selector-web/src/test/java/com/liferay/asset/list/item/selector/web/internal/display/context/AssetListEntryItemSelectorDisplayContextTest.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.test.rule.LiferayUnitTestRule;
-import java.util.Arrays;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
import org.junit.Assert;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-list-service/build.gradle b/modules/apps/asset/asset-list-service/build.gradle
index c20d4cad04ad88..ab368af993f2b8 100644
--- a/modules/apps/asset/asset-list-service/build.gradle
+++ b/modules/apps/asset/asset-list-service/build.gradle
@@ -5,10 +5,10 @@ buildService {
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/internal/exportimport/data/handler/AssetListPortletDataHandler.java b/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/internal/exportimport/data/handler/AssetListPortletDataHandler.java
index 0b2172503080ff..2ffb0191934723 100644
--- a/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/internal/exportimport/data/handler/AssetListPortletDataHandler.java
+++ b/modules/apps/asset/asset-list-service/src/main/java/com/liferay/asset/list/internal/exportimport/data/handler/AssetListPortletDataHandler.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.module.framework.ModuleServiceLifecycle;
import com.liferay.portal.kernel.xml.Element;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -34,7 +34,7 @@
* @author Jürgen Kappler
*/
@Component(
- property = "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ property = "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
service = PortletDataHandler.class
)
public class AssetListPortletDataHandler extends BasePortletDataHandler {
diff --git a/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/AddAssetListEntryMVCActionCommandTest.java b/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/AddAssetListEntryMVCActionCommandTest.java
index 6fa4163ac01f51..3d3532ec9b84d6 100644
--- a/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/AddAssetListEntryMVCActionCommandTest.java
+++ b/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/AddAssetListEntryMVCActionCommandTest.java
@@ -28,23 +28,23 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletModeException;
+import jakarta.portlet.PortletSecurityException;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderURL;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
+import jakarta.portlet.annotations.PortletSerializable;
+
import java.io.IOException;
import java.io.Writer;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletModeException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderURL;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
-import javax.portlet.annotations.PortletSerializable;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/AddAssetListEntryVariationMVCActionCommandTest.java b/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/AddAssetListEntryVariationMVCActionCommandTest.java
index ceb5c19bce3e9d..ef7de83c3bb92a 100644
--- a/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/AddAssetListEntryVariationMVCActionCommandTest.java
+++ b/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/AddAssetListEntryVariationMVCActionCommandTest.java
@@ -36,8 +36,8 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/UpdateAssetListEntryMVCActionCommandTest.java b/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/UpdateAssetListEntryMVCActionCommandTest.java
index 389a032e477fdb..dfdb074745ef50 100644
--- a/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/UpdateAssetListEntryMVCActionCommandTest.java
+++ b/modules/apps/asset/asset-list-test/src/testIntegration/java/com/liferay/asset/list/internal/portlet/action/test/UpdateAssetListEntryMVCActionCommandTest.java
@@ -24,19 +24,19 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderURL;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.annotations.PortletSerializable;
+
import java.io.Writer;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderURL;
-import javax.portlet.WindowState;
-import javax.portlet.annotations.PortletSerializable;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-list-web/build.gradle b/modules/apps/asset/asset-list-web/build.gradle
index 9bf32bfa9b1ccb..e5e248cc683378 100644
--- a/modules/apps/asset/asset-list-web/build.gradle
+++ b/modules/apps/asset/asset-list-web/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
compileOnly group: "commons-lang", name: "commons-lang", version: "2.6"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/application/list/AssetListPanelApp.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/application/list/AssetListPanelApp.java
index b3f445f8619bcf..f2d0c7bdddf6a5 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/application/list/AssetListPanelApp.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/application/list/AssetListPanelApp.java
@@ -47,7 +47,7 @@ public boolean isShow(PermissionChecker permissionChecker, Group group)
}
@Reference(
- target = "(javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST + ")"
+ target = "(jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListDisplayContext.java
index e16821f8f1bae2..33ea547d196970 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListDisplayContext.java
@@ -55,13 +55,13 @@
import com.liferay.staging.StagingGroupHelper;
import com.liferay.staging.StagingGroupHelperUtil;
-import java.util.List;
-import java.util.Objects;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListEntryUsagesDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListEntryUsagesDisplayContext.java
index 153e9c9b8881ea..5805da0b4d1367 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListEntryUsagesDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListEntryUsagesDisplayContext.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
/**
* @author Pavel Savinov
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListEntryUsagesManagementToolbarDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListEntryUsagesManagementToolbarDisplayContext.java
index b64db62486ea4b..892845b55053c7 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListEntryUsagesManagementToolbarDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListEntryUsagesManagementToolbarDisplayContext.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletRequest;
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListItemsDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListItemsDisplayContext.java
index 25ba45729e30ae..2a96351e9ac8ca 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListItemsDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListItemsDisplayContext.java
@@ -19,13 +19,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.segments.constants.SegmentsEntryConstants;
-import java.util.List;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListManagementToolbarDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListManagementToolbarDisplayContext.java
index 128e57415cae99..12b25e4d459af2 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListManagementToolbarDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/AssetListManagementToolbarDisplayContext.java
@@ -26,9 +26,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContext.java
index 125ef34991c85e..4bf5e9d940890b 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContext.java
@@ -93,6 +93,12 @@
import com.liferay.staging.StagingGroupHelper;
import com.liferay.staging.StagingGroupHelperUtil;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.text.Collator;
@@ -108,12 +114,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Pavel Savinov
*/
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/InfoCollectionProviderDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/InfoCollectionProviderDisplayContext.java
index a51864920eb7ca..2984dc9a80aec6 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/InfoCollectionProviderDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/InfoCollectionProviderDisplayContext.java
@@ -21,15 +21,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Comparator;
-import java.util.List;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Comparator;
+import java.util.List;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/InfoCollectionProviderItemsDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/InfoCollectionProviderItemsDisplayContext.java
index bff30f3434d398..02ff547dbe4a3b 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/InfoCollectionProviderItemsDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/InfoCollectionProviderItemsDisplayContext.java
@@ -29,12 +29,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/SelectStructureFieldDisplayContext.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/SelectStructureFieldDisplayContext.java
index 2a2daa3760f494..9e1150deae8b9b 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/SelectStructureFieldDisplayContext.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/display/context/SelectStructureFieldDisplayContext.java
@@ -21,14 +21,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/clay/servlet/taglib/AssetListEntryVerticalCard.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/clay/servlet/taglib/AssetListEntryVerticalCard.java
index fdc680bca320d8..65d34549045326 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/clay/servlet/taglib/AssetListEntryVerticalCard.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/clay/servlet/taglib/AssetListEntryVerticalCard.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import java.util.List;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListFilterFormNavigatorEntry.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListFilterFormNavigatorEntry.java
index d5bc2fb62bcb54..d29c4f30d51bea 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListFilterFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListFilterFormNavigatorEntry.java
@@ -11,7 +11,7 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.model.User;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListOrderingFormNavigatorEntry.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListOrderingFormNavigatorEntry.java
index daff6bb690ef55..72611a21e95e98 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListOrderingFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListOrderingFormNavigatorEntry.java
@@ -11,7 +11,7 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.model.User;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListScopeFormNavigatorEntry.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListScopeFormNavigatorEntry.java
index 78585c3d52bb7a..212c5b492cb702 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListScopeFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListScopeFormNavigatorEntry.java
@@ -13,11 +13,11 @@
import com.liferay.item.selector.ItemSelector;
import com.liferay.portal.kernel.model.User;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListSourceFormNavigatorEntry.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListSourceFormNavigatorEntry.java
index 1d99dee5410531..5a1e30859932c7 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListSourceFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/frontend/taglib/form/navigator/AssetListSourceFormNavigatorEntry.java
@@ -11,7 +11,7 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.model.User;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/handler/AssetListEntryExceptionRequestHandlerUtil.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/handler/AssetListEntryExceptionRequestHandlerUtil.java
index 0c17d4e9bcb694..0cad97e668013e 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/handler/AssetListEntryExceptionRequestHandlerUtil.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/handler/AssetListEntryExceptionRequestHandlerUtil.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListControlPanelEntry.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListControlPanelEntry.java
index 38f3c446800cef..be8b6ee5f9bd77 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListControlPanelEntry.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListControlPanelEntry.java
@@ -18,7 +18,7 @@
* @author Jürgen Kappler
*/
@Component(
- property = "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ property = "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
service = ControlPanelEntry.class
)
public class AssetListControlPanelEntry extends BaseControlPanelEntry {
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListEditPortletProvider.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListEditPortletProvider.java
index a04c3cc210e9cd..02fa47c1ca8c8e 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListEditPortletProvider.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListEditPortletProvider.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.portlet.PortletProvider;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListPortlet.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListPortlet.java
index 42fecc32e94aa3..d86356bc931204 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListPortlet.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListPortlet.java
@@ -32,12 +32,12 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.segments.configuration.provider.SegmentsConfigurationProvider;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -57,13 +57,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Asset List",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Asset List",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListSelectorViewPortletProvider.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListSelectorViewPortletProvider.java
index 95ccc3cb7330aa..a2333fb35199e0 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListSelectorViewPortletProvider.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/AssetListSelectorViewPortletProvider.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.portlet.PortletProvider;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetEntrySelectionMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetEntrySelectionMVCActionCommand.java
index 86832f0ace1c47..6aa6370551033e 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetEntrySelectionMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetEntrySelectionMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.service.ServiceContextFactory;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/add_asset_entry_selection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetListEntryMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetListEntryMVCActionCommand.java
index fd85711f4ca481..64b8d585d49258 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetListEntryMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetListEntryMVCActionCommand.java
@@ -26,8 +26,8 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/add_asset_list_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetListEntryVariationMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetListEntryVariationMVCActionCommand.java
index 1dcaf32cda8d65..6b21f05b418a34 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetListEntryVariationMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/AddAssetListEntryVariationMVCActionCommand.java
@@ -23,8 +23,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.segments.constants.SegmentsEntryConstants;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/add_asset_list_entry_variation"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetEntrySelectionMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetEntrySelectionMVCActionCommand.java
index 4cab2e40d630e5..901a6789bea2c7 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetEntrySelectionMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetEntrySelectionMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/delete_asset_entry_selection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetListEntriesMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetListEntriesMVCActionCommand.java
index 4757ab6161566c..911181ad00348c 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetListEntriesMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetListEntriesMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/delete_asset_list_entries"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetListEntryVariationMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetListEntryVariationMVCActionCommand.java
index 86e73966690f44..32bc70171c77fc 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetListEntryVariationMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/DeleteAssetListEntryVariationMVCActionCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/delete_asset_list_entry_variation"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/GetFieldItemMVCResourceCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/GetFieldItemMVCResourceCommand.java
index e309e8afa2e67b..ccee33d27b542c 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/GetFieldItemMVCResourceCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/GetFieldItemMVCResourceCommand.java
@@ -9,8 +9,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.BaseMVCResourceCommand;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCResourceCommand;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/get_field_item"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/GetFieldValueMVCResourceCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/GetFieldValueMVCResourceCommand.java
index e526a852274305..ce36474f20d9b7 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/GetFieldValueMVCResourceCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/GetFieldValueMVCResourceCommand.java
@@ -30,16 +30,16 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.io.Serializable;
import java.text.DateFormat;
import java.util.Date;
-import javax.portlet.PortletException;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -48,7 +48,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/get_field_value"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/MoveAssetEntrySelectionMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/MoveAssetEntrySelectionMVCActionCommand.java
index c7952d45801b07..ae969f44c55624 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/MoveAssetEntrySelectionMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/MoveAssetEntrySelectionMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/move_asset_entry_selection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryDynamicMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryDynamicMVCActionCommand.java
index cbde9b412d7352..c6dc728e4eeacc 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryDynamicMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryDynamicMVCActionCommand.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.apache.commons.lang.text.StrMatcher;
import org.apache.commons.lang.text.StrTokenizer;
@@ -42,7 +42,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/update_asset_list_entry_dynamic"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryMVCActionCommand.java
index 97a5460539e508..05d35391f89925 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/update_asset_list_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryManualMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryManualMVCActionCommand.java
index 3b908808c77d37..039679c3a57f84 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryManualMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateAssetListEntryManualMVCActionCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.util.PropertiesParamUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/update_asset_list_entry_manual"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateVariationsPriorityMVCActionCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateVariationsPriorityMVCActionCommand.java
index c2a0204697a8c4..65d796d8180a03 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateVariationsPriorityMVCActionCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/UpdateVariationsPriorityMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/update_variations_priority"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/ViewListItemsMVCRenderCommand.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/ViewListItemsMVCRenderCommand.java
index 23e76ff0f1b8a5..b739bdea3598f1 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/ViewListItemsMVCRenderCommand.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/portlet/action/ViewListItemsMVCRenderCommand.java
@@ -11,11 +11,11 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
+ "jakarta.portlet.name=" + AssetListPortletKeys.ASSET_LIST,
"mvc.command.name=/asset_list/view_list_items"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/AssetListEntryActionDropdownItemsProvider.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/AssetListEntryActionDropdownItemsProvider.java
index 31d2501094b09b..aeb71551f0e26f 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/AssetListEntryActionDropdownItemsProvider.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/AssetListEntryActionDropdownItemsProvider.java
@@ -29,9 +29,9 @@
import com.liferay.staging.StagingGroupHelperUtil;
import com.liferay.taglib.security.PermissionsURLTag;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/AssetListEntryVariationActionDropdownItemsProvider.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/AssetListEntryVariationActionDropdownItemsProvider.java
index 3ba9b3aee23831..507c00f5641d06 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/AssetListEntryVariationActionDropdownItemsProvider.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/AssetListEntryVariationActionDropdownItemsProvider.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.segments.constants.SegmentsEntryConstants;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Diego Hu
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/InfoCollectionProviderActionDropdownItems.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/InfoCollectionProviderActionDropdownItems.java
index dfe66190876161..5a15f6ab8ee314 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/InfoCollectionProviderActionDropdownItems.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/InfoCollectionProviderActionDropdownItems.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Jürgen Kappler
diff --git a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/ListItemsActionDropdownItems.java b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/ListItemsActionDropdownItems.java
index df9b02d02be4ba..a2d0e01fb546d7 100644
--- a/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/ListItemsActionDropdownItems.java
+++ b/modules/apps/asset/asset-list-web/src/main/java/com/liferay/asset/list/web/internal/servlet/taglib/util/ListItemsActionDropdownItems.java
@@ -33,11 +33,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.repository.liferayrepository.model.LiferayFileEntry;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Jürgen Kappler
*/
diff --git a/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/init.jsp
index f1cf99147497c4..df7a7be9bd1413 100644
--- a/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/asset/asset-list-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -84,6 +84,8 @@ page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@
page import="com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntriesUtil" %><%@
page import="com.liferay.taglib.search.ResultRow" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.io.Serializable" %>
<%@ page import="java.util.ArrayList" %><%@
@@ -93,8 +95,6 @@ page import="java.util.List" %><%@
page import="java.util.Map" %><%@
page import="java.util.Objects" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/asset/asset-list-web/src/test/java/com/liferay/asset/list/web/internal/display/context/AssetListDisplayContextTest.java b/modules/apps/asset/asset-list-web/src/test/java/com/liferay/asset/list/web/internal/display/context/AssetListDisplayContextTest.java
index 6677e0bf018aba..2bd9e0363e8ad4 100644
--- a/modules/apps/asset/asset-list-web/src/test/java/com/liferay/asset/list/web/internal/display/context/AssetListDisplayContextTest.java
+++ b/modules/apps/asset/asset-list-web/src/test/java/com/liferay/asset/list/web/internal/display/context/AssetListDisplayContextTest.java
@@ -13,11 +13,11 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.test.rule.LiferayUnitTestRule;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-list-web/src/test/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContextTest.java b/modules/apps/asset/asset-list-web/src/test/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContextTest.java
index 69101cac024efa..b1140245cf1a20 100644
--- a/modules/apps/asset/asset-list-web/src/test/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContextTest.java
+++ b/modules/apps/asset/asset-list-web/src/test/java/com/liferay/asset/list/web/internal/display/context/EditAssetListDisplayContextTest.java
@@ -35,12 +35,12 @@
import com.liferay.portal.test.rule.LiferayUnitTestRule;
import com.liferay.segments.configuration.provider.SegmentsConfigurationProvider;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/modules/apps/asset/asset-publisher-api/build.gradle b/modules/apps/asset/asset-publisher-api/build.gradle
index e92314568e7526..d7eac71b093e74 100644
--- a/modules/apps/asset/asset-publisher-api/build.gradle
+++ b/modules/apps/asset/asset-publisher-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:info:info-api")
diff --git a/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/action/AssetEntryAction.java b/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/action/AssetEntryAction.java
index a320c66ef2693c..3a8a5420be9515 100644
--- a/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/action/AssetEntryAction.java
+++ b/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/action/AssetEntryAction.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.security.permission.PermissionChecker;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/util/AssetPublisherHelper.java b/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/util/AssetPublisherHelper.java
index 431d221dcae00e..d1f9032016e65b 100644
--- a/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/util/AssetPublisherHelper.java
+++ b/modules/apps/asset/asset-publisher-api/src/main/java/com/liferay/asset/publisher/util/AssetPublisherHelper.java
@@ -18,6 +18,10 @@
import com.liferay.portal.kernel.search.BaseModelSearchResult;
import com.liferay.portal.kernel.security.permission.PermissionChecker;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.io.Serializable;
import java.util.List;
@@ -25,10 +29,6 @@
import java.util.Map;
import java.util.TimeZone;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/asset/asset-publisher-layout-prototype/build.gradle b/modules/apps/asset/asset-publisher-layout-prototype/build.gradle
index 07a6a2f541b15c..c7ab02e1a1e50f 100644
--- a/modules/apps/asset/asset-publisher-layout-prototype/build.gradle
+++ b/modules/apps/asset/asset-publisher-layout-prototype/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-categories-navigation-api")
compileOnly project(":apps:asset:asset-publisher-api")
diff --git a/modules/apps/asset/asset-publisher-test/build.gradle b/modules/apps/asset/asset-publisher-test/build.gradle
index 74676fb044a9aa..020ceb63a1cfde 100644
--- a/modules/apps/asset/asset-publisher-test/build.gradle
+++ b/modules/apps/asset/asset-publisher-test/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- testIntegrationImplementation group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ testIntegrationImplementation group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
testIntegrationImplementation group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
testIntegrationImplementation project(":apps:asset:asset-api")
testIntegrationImplementation project(":apps:asset:asset-link-api")
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/exportimport/test/AssetPublisherExportImportTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/exportimport/test/AssetPublisherExportImportTest.java
index 3f2d44fc0dd69c..351a4b1911596a 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/exportimport/test/AssetPublisherExportImportTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/exportimport/test/AssetPublisherExportImportTest.java
@@ -85,6 +85,8 @@
import com.liferay.portlet.display.template.test.util.BaseExportImportTestCase;
import com.liferay.portletmvc4spring.test.mock.web.portlet.MockPortletRequest;
+import jakarta.portlet.PortletPreferences;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -97,8 +99,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/frontend/taglib/form/navigator/test/AssetPublisherConfigurationFormNavigatorTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/frontend/taglib/form/navigator/test/AssetPublisherConfigurationFormNavigatorTest.java
index 0ac23e04928d81..fdf1a2fa6106a7 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/frontend/taglib/form/navigator/test/AssetPublisherConfigurationFormNavigatorTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/frontend/taglib/form/navigator/test/AssetPublisherConfigurationFormNavigatorTest.java
@@ -32,11 +32,11 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/display/context/test/AssetPublisherDisplayContextTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/display/context/test/AssetPublisherDisplayContextTest.java
index 9952c32909d50d..c81b612fe2df5e 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/display/context/test/AssetPublisherDisplayContextTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/display/context/test/AssetPublisherDisplayContextTest.java
@@ -54,17 +54,17 @@
import com.liferay.portlet.PortletPreferencesImpl;
import com.liferay.portlet.test.MockLiferayPortletContext;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Arrays;
import java.util.Date;
import java.util.List;
-import javax.portlet.Portlet;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/exportimport/portlet/preferences/processor/test/AssetPublisherExportImportPortletPreferencesProcessorTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/exportimport/portlet/preferences/processor/test/AssetPublisherExportImportPortletPreferencesProcessorTest.java
index c303e5414fcd50..c32f47fad33280 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/exportimport/portlet/preferences/processor/test/AssetPublisherExportImportPortletPreferencesProcessorTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/exportimport/portlet/preferences/processor/test/AssetPublisherExportImportPortletPreferencesProcessorTest.java
@@ -30,9 +30,9 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
-import java.util.HashMap;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.HashMap;
import org.junit.Assert;
import org.junit.Before;
@@ -199,7 +199,7 @@ public void testProcessQueryNames() throws Exception {
}
@Inject(
- filter = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER
+ filter = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER
)
private ExportImportPortletPreferencesProcessor
_exportImportPortletPreferencesProcessor;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/portlet/action/test/AddAssetListMVCActionCommandTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/portlet/action/test/AddAssetListMVCActionCommandTest.java
index 12e35fb536a8ed..8fd1bf7be3f746 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/portlet/action/test/AddAssetListMVCActionCommandTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/internal/portlet/action/test/AddAssetListMVCActionCommandTest.java
@@ -27,9 +27,9 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
-import java.util.Collections;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.Collections;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/nofications/test/AssetPublisherUserNotificationTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/nofications/test/AssetPublisherUserNotificationTest.java
index 7e63ede91da836..c181bbfd6936e3 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/nofications/test/AssetPublisherUserNotificationTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/nofications/test/AssetPublisherUserNotificationTest.java
@@ -188,7 +188,7 @@ private void _subscribe() throws Exception {
}
private void _updatePortletPreferences() throws Exception {
- javax.portlet.PortletPreferences portletPreferences =
+ jakarta.portlet.PortletPreferences portletPreferences =
LayoutTestUtil.getPortletPreferences(_layout, _portletId);
portletPreferences.setValue(
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/service/test/AssetPublisherServiceTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/service/test/AssetPublisherServiceTest.java
index ba407d127269e0..591cbe3d20f161 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/service/test/AssetPublisherServiceTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/service/test/AssetPublisherServiceTest.java
@@ -36,11 +36,11 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portletmvc4spring.test.mock.web.portlet.MockPortletPreferences;
+import jakarta.portlet.PortletPreferences;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletPreferences;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_0/test/UpgradePortletPreferencesTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_0/test/UpgradePortletPreferencesTest.java
index 2e27fba3ce2006..ed2e377173783c 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_0/test/UpgradePortletPreferencesTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_0/test/UpgradePortletPreferencesTest.java
@@ -42,6 +42,8 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+import jakarta.portlet.PortletPreferences;
+
import java.lang.reflect.Constructor;
import java.text.DateFormat;
@@ -50,8 +52,6 @@
import java.util.Date;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_1/test/UpgradePortletPreferencesTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_1/test/UpgradePortletPreferencesTest.java
index fd93eab5739a6a..7c59776c22b4b4 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_1/test/UpgradePortletPreferencesTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_1/test/UpgradePortletPreferencesTest.java
@@ -31,13 +31,13 @@
import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
import com.liferay.portal.upgrade.test.util.UpgradeTestUtil;
+import jakarta.portlet.PortletPreferences;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_5/test/UpgradePortletPreferencesTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_5/test/UpgradePortletPreferencesTest.java
index 4a53460207f103..ffc1aa3e0b5b71 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_5/test/UpgradePortletPreferencesTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/upgrade/v1_0_5/test/UpgradePortletPreferencesTest.java
@@ -26,7 +26,7 @@
import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
import com.liferay.portal.upgrade.test.util.UpgradeTestUtil;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/util/test/AssetPublisherHelperTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/util/test/AssetPublisherHelperTest.java
index a4305548d1f450..4aa31bc1e22907 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/util/test/AssetPublisherHelperTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/util/test/AssetPublisherHelperTest.java
@@ -58,12 +58,12 @@
import com.liferay.ratings.test.util.RatingsTestUtil;
import com.liferay.segments.criteria.contributor.SegmentsCriteriaContributor;
+import jakarta.portlet.PortletPreferences;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import javax.portlet.PortletPreferences;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/web/internal/scheduler/helper/test/AssetEntriesCheckerHelperTest.java b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/web/internal/scheduler/helper/test/AssetEntriesCheckerHelperTest.java
index 82ce02b9b5243a..746eb784299aed 100644
--- a/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/web/internal/scheduler/helper/test/AssetEntriesCheckerHelperTest.java
+++ b/modules/apps/asset/asset-publisher-test/src/testIntegration/java/com/liferay/asset/publisher/web/internal/scheduler/helper/test/AssetEntriesCheckerHelperTest.java
@@ -43,6 +43,8 @@
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
import com.liferay.segments.configuration.provider.SegmentsConfigurationProvider;
+import jakarta.portlet.PortletPreferences;
+
import java.lang.reflect.Constructor;
import java.util.Arrays;
@@ -50,8 +52,6 @@
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-publisher-web/build.gradle b/modules/apps/asset/asset-publisher-web/build.gradle
index d3bcf700b65451..2a05cc9283f7d4 100644
--- a/modules/apps/asset/asset-publisher-web/build.gradle
+++ b/modules/apps/asset/asset-publisher-web/build.gradle
@@ -1,13 +1,13 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.java", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
compileOnly group: "commons-lang", name: "commons-lang", version: "2.6"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/asset/display/page/portlet/DefaultAssetDisplayPageFriendlyURLResolver.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/asset/display/page/portlet/DefaultAssetDisplayPageFriendlyURLResolver.java
index 8bdba6a0fbb553..168c21a678d67b 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/asset/display/page/portlet/DefaultAssetDisplayPageFriendlyURLResolver.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/asset/display/page/portlet/DefaultAssetDisplayPageFriendlyURLResolver.java
@@ -61,16 +61,16 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.kernel.workflow.permission.WorkflowPermissionUtil;
+import jakarta.portlet.WindowState;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.WindowState;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherDisplayContext.java
index cf862272f8f7e3..5685301077363e 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherDisplayContext.java
@@ -118,6 +118,14 @@
import com.liferay.segments.constants.SegmentsWebKeys;
import com.liferay.segments.context.RequestContextMapper;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.text.Collator;
@@ -133,14 +141,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherViewContentDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherViewContentDisplayContext.java
index 09bfd535111fcf..b9a31089df3489 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherViewContentDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/AssetPublisherViewContentDisplayContext.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import java.util.Objects;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/BaseItemSelectorViewDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/BaseItemSelectorViewDisplayContext.java
index 83096bd8c93667..daeb3a7d5dce40 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/BaseItemSelectorViewDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/BaseItemSelectorViewDisplayContext.java
@@ -13,11 +13,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/ChildSitesItemSelectorViewDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/ChildSitesItemSelectorViewDisplayContext.java
index 59bf0f870197b2..de7c15579809e9 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/ChildSitesItemSelectorViewDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/ChildSitesItemSelectorViewDisplayContext.java
@@ -22,15 +22,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.site.search.GroupSearch;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/LayoutScopesItemSelectorViewDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/LayoutScopesItemSelectorViewDisplayContext.java
index 76628c1017bf22..17dfd7867ca2b1 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/LayoutScopesItemSelectorViewDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/LayoutScopesItemSelectorViewDisplayContext.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.site.search.GroupSearch;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/ParentSitesItemSelectorViewDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/ParentSitesItemSelectorViewDisplayContext.java
index 1da27c9076a043..a09bf7d3b50973 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/ParentSitesItemSelectorViewDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/ParentSitesItemSelectorViewDisplayContext.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.site.search.GroupSearch;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/SelectStructureFieldDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/SelectStructureFieldDisplayContext.java
index ac9d0d40466205..c0ec4872f6fce5 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/SelectStructureFieldDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/SelectStructureFieldDisplayContext.java
@@ -23,15 +23,15 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ResourceURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.ResourceURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/SitesThatIAdministerItemSelectorViewDisplayContext.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/SitesThatIAdministerItemSelectorViewDisplayContext.java
index 48d44bc5881b9c..4246bd99ff6d7f 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/SitesThatIAdministerItemSelectorViewDisplayContext.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/display/context/SitesThatIAdministerItemSelectorViewDisplayContext.java
@@ -22,15 +22,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.site.search.GroupSearch;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/AssetPublisherPortletDataHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/AssetPublisherPortletDataHandler.java
index fcc04fc9e1dcf2..dbc55fdb62795a 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/AssetPublisherPortletDataHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/AssetPublisherPortletDataHandler.java
@@ -22,7 +22,7 @@
* @author Julio Camarero
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = PortletDataHandler.class
)
public class AssetPublisherPortletDataHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/HighestRatedAssetsPortletDataHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/HighestRatedAssetsPortletDataHandler.java
index faff11836d464d..a5836641408139 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/HighestRatedAssetsPortletDataHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/HighestRatedAssetsPortletDataHandler.java
@@ -20,7 +20,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
service = PortletDataHandler.class
)
public class HighestRatedAssetsPortletDataHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/MostViewedAssetsPortletDataHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/MostViewedAssetsPortletDataHandler.java
index 1190b2bfa7ddea..382e88b8acda24 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/MostViewedAssetsPortletDataHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/MostViewedAssetsPortletDataHandler.java
@@ -20,7 +20,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
service = PortletDataHandler.class
)
public class MostViewedAssetsPortletDataHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/RelatedAssetsPortletDataHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/RelatedAssetsPortletDataHandler.java
index 28b62c1a6d1554..dd0199f304688e 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/RelatedAssetsPortletDataHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/data/handler/RelatedAssetsPortletDataHandler.java
@@ -20,7 +20,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
service = PortletDataHandler.class
)
public class RelatedAssetsPortletDataHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/AssetPublisherExportImportPortletPreferencesProcessor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/AssetPublisherExportImportPortletPreferencesProcessor.java
index 016aad6e37fa56..5c9ff802f33788 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/AssetPublisherExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/AssetPublisherExportImportPortletPreferencesProcessor.java
@@ -80,6 +80,8 @@
import com.liferay.site.model.adapter.StagedGroup;
import com.liferay.staging.StagingGroupHelper;
+import jakarta.portlet.PortletPreferences;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -89,8 +91,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
@@ -108,7 +108,7 @@
*/
@Component(
configurationPid = "com.liferay.asset.publisher.web.internal.configuration.AssetPublisherWebConfiguration",
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = ExportImportPortletPreferencesProcessor.class
)
public class AssetPublisherExportImportPortletPreferencesProcessor
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/HighestRatedAssetsExportImportPortletPreferencesProcessor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/HighestRatedAssetsExportImportPortletPreferencesProcessor.java
index 903a3599face0d..ea12acdd69fccd 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/HighestRatedAssetsExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/HighestRatedAssetsExportImportPortletPreferencesProcessor.java
@@ -21,7 +21,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
service = ExportImportPortletPreferencesProcessor.class
)
public class HighestRatedAssetsExportImportPortletPreferencesProcessor
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/MostViewedAssetsExportImportPortletPreferencesProcessor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/MostViewedAssetsExportImportPortletPreferencesProcessor.java
index e6ccabc5591f66..9da13e0d7810dc 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/MostViewedAssetsExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/MostViewedAssetsExportImportPortletPreferencesProcessor.java
@@ -21,7 +21,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
service = ExportImportPortletPreferencesProcessor.class
)
public class MostViewedAssetsExportImportPortletPreferencesProcessor
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/RecentContentExportImportPortletPreferencesProcessor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/RecentContentExportImportPortletPreferencesProcessor.java
index 086808d247d75c..718d1b2ee1a8ef 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/RecentContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/RecentContentExportImportPortletPreferencesProcessor.java
@@ -21,7 +21,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
service = ExportImportPortletPreferencesProcessor.class
)
public class RecentContentExportImportPortletPreferencesProcessor
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/RelatedAssetsExportImportPortletPreferencesProcessor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/RelatedAssetsExportImportPortletPreferencesProcessor.java
index 556aabaabac752..b1e4c914199c76 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/RelatedAssetsExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/exportimport/portlet/preferences/processor/RelatedAssetsExportImportPortletPreferencesProcessor.java
@@ -21,7 +21,7 @@
* @author Michael Bowerman
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
service = ExportImportPortletPreferencesProcessor.class
)
public class RelatedAssetsExportImportPortletPreferencesProcessor
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/AssetEntriesFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/AssetEntriesFormNavigatorEntry.java
index b67b58030c6037..d55a75c7191af5 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/AssetEntriesFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/AssetEntriesFormNavigatorEntry.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.model.User;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/AssetListFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/AssetListFormNavigatorEntry.java
index a3688c8ebdab65..d6353fc50b9f4d 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/AssetListFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/AssetListFormNavigatorEntry.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.model.User;
-import java.util.Objects;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/BaseConfigurationFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/BaseConfigurationFormNavigatorEntry.java
index 8f24c9908927e5..239b0ec1c47bdb 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/BaseConfigurationFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/BaseConfigurationFormNavigatorEntry.java
@@ -17,11 +17,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.GetterUtil;
+import jakarta.portlet.PortletPreferences;
+
import java.util.Locale;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/CreateAssetListFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/CreateAssetListFormNavigatorEntry.java
index 7717c11f53898f..61feb66f97316f 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/CreateAssetListFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/CreateAssetListFormNavigatorEntry.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.model.User;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/DisplaySettingsFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/DisplaySettingsFormNavigatorEntry.java
index 681a276bb4ec7d..cdacdf1d5053cc 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/DisplaySettingsFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/DisplaySettingsFormNavigatorEntry.java
@@ -8,7 +8,7 @@
import com.liferay.asset.publisher.constants.AssetPublisherConstants;
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/FilterFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/FilterFormNavigatorEntry.java
index 3555c5d2d728b0..86310f4a9301e5 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/FilterFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/FilterFormNavigatorEntry.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.model.User;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/GroupingFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/GroupingFormNavigatorEntry.java
index 6f34f4af0c71b0..6baaf2feda1b82 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/GroupingFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/GroupingFormNavigatorEntry.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import java.util.Map;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/InfoMessageFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/InfoMessageFormNavigatorEntry.java
index fc20b362f0b6a7..e6f54d7391da95 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/InfoMessageFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/InfoMessageFormNavigatorEntry.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.model.User;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/MetadataFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/MetadataFormNavigatorEntry.java
index 21a8f93cead1cc..1641adcad449aa 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/MetadataFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/MetadataFormNavigatorEntry.java
@@ -8,7 +8,7 @@
import com.liferay.asset.publisher.constants.AssetPublisherConstants;
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/OrderingFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/OrderingFormNavigatorEntry.java
index 2ad74c5269f676..cbff672d79ecdf 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/OrderingFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/OrderingFormNavigatorEntry.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import java.util.Map;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/RSSFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/RSSFormNavigatorEntry.java
index bd64421cee449e..1ed726c2233cc5 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/RSSFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/RSSFormNavigatorEntry.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.util.Portal;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/RatingsOrderingNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/RatingsOrderingNavigatorEntry.java
index e616c81ae3ab81..d2c0e8dabff0b1 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/RatingsOrderingNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/RatingsOrderingNavigatorEntry.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import java.util.Objects;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/ScopeFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/ScopeFormNavigatorEntry.java
index fd83fbd4390ec6..e4ee4e6c5e6766 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/ScopeFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/ScopeFormNavigatorEntry.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.model.User;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
index a590101d17693b..84697ec34862c4 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import java.util.Map;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SetAndEnableFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SetAndEnableFormNavigatorEntry.java
index 153b494a95e0d4..6818b83ebd6107 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SetAndEnableFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SetAndEnableFormNavigatorEntry.java
@@ -8,7 +8,7 @@
import com.liferay.asset.publisher.constants.AssetPublisherConstants;
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SourceFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SourceFormNavigatorEntry.java
index 64f71f8af6c1bb..d0a40c60272435 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SourceFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SourceFormNavigatorEntry.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil;
import com.liferay.portal.kernel.model.User;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SubscriptionsFormNavigatorEntry.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SubscriptionsFormNavigatorEntry.java
index 7e6d8a38e2f7a9..03f9bc54bd8914 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SubscriptionsFormNavigatorEntry.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/frontend/taglib/form/navigator/SubscriptionsFormNavigatorEntry.java
@@ -8,7 +8,7 @@
import com.liferay.asset.publisher.constants.AssetPublisherConstants;
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/helper/AssetPublisherWebHelper.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/helper/AssetPublisherWebHelper.java
index b4bf48f43c6bcf..d7d521e88a6d38 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/helper/AssetPublisherWebHelper.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/helper/AssetPublisherWebHelper.java
@@ -70,6 +70,9 @@
import com.liferay.portlet.StrictPortletPreferencesImpl;
import com.liferay.subscription.service.SubscriptionLocalService;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.util.ArrayList;
@@ -77,9 +80,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/info/collection/provider/RelatedAssetsInfoCollectionProvider.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/info/collection/provider/RelatedAssetsInfoCollectionProvider.java
index ced3ab094c3cb6..9f8552a2f794eb 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/info/collection/provider/RelatedAssetsInfoCollectionProvider.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/info/collection/provider/RelatedAssetsInfoCollectionProvider.java
@@ -28,13 +28,13 @@
import com.liferay.portal.kernel.util.SetUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.Locale;
import java.util.Objects;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/ChildSitesItemSelectorView.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/ChildSitesItemSelectorView.java
index 90ac9415c8084d..dd4a2f7876381b 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/ChildSitesItemSelectorView.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/ChildSitesItemSelectorView.java
@@ -18,19 +18,19 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/LayoutScopesItemSelectorView.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/LayoutScopesItemSelectorView.java
index c9cad623c36cf9..0f4c9521f8b537 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/LayoutScopesItemSelectorView.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/LayoutScopesItemSelectorView.java
@@ -18,19 +18,19 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/ParentSitesItemSelectorView.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/ParentSitesItemSelectorView.java
index b4df91ba53f6f2..32685c23d29f2d 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/ParentSitesItemSelectorView.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/ParentSitesItemSelectorView.java
@@ -17,19 +17,19 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesItemDescriptor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesItemDescriptor.java
index 445b7f3655a55e..c5c9899557ec07 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesItemDescriptor.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesItemDescriptor.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesItemSelectorViewDescriptor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesItemSelectorViewDescriptor.java
index 13a8548b356313..94aff9e3a77be1 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesItemSelectorViewDescriptor.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesItemSelectorViewDescriptor.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.model.Group;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesThatIAdministerItemSelectorView.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesThatIAdministerItemSelectorView.java
index 46149eb0791fad..239098a4fe87cb 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesThatIAdministerItemSelectorView.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/item/selector/SitesThatIAdministerItemSelectorView.java
@@ -19,19 +19,19 @@
import com.liferay.portal.kernel.util.PropsKeys;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/HighestRatedAssetsPortletManager.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/HighestRatedAssetsPortletManager.java
index afea421c57434e..b3ce14b377f30f 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/HighestRatedAssetsPortletManager.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/HighestRatedAssetsPortletManager.java
@@ -16,7 +16,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
service = PortletManager.class
)
public class HighestRatedAssetsPortletManager implements PortletManager {
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/MostViewedAssetsPortletManager.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/MostViewedAssetsPortletManager.java
index 4f6ab4d9b78333..20af29e39c35da 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/MostViewedAssetsPortletManager.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/MostViewedAssetsPortletManager.java
@@ -16,7 +16,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
service = PortletManager.class
)
public class MostViewedAssetsPortletManager implements PortletManager {
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/RecentContentPortletManager.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/RecentContentPortletManager.java
index d77a50e2b965b5..1ac853ea568ded 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/RecentContentPortletManager.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/RecentContentPortletManager.java
@@ -16,7 +16,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
service = PortletManager.class
)
public class RecentContentPortletManager implements PortletManager {
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/RelatedAssetsPortletManager.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/RelatedAssetsPortletManager.java
index 89d27a474ebc96..4317871472a85c 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/RelatedAssetsPortletManager.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/layout/portlet/RelatedAssetsPortletManager.java
@@ -16,7 +16,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
service = PortletManager.class
)
public class RelatedAssetsPortletManager implements PortletManager {
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/notifications/AssetPublisherUserNotificationDefinition.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/notifications/AssetPublisherUserNotificationDefinition.java
index c5f8b6179d330d..74601570d23926 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/notifications/AssetPublisherUserNotificationDefinition.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/notifications/AssetPublisherUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Roberto Díaz
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = UserNotificationDefinition.class
)
public class AssetPublisherUserNotificationDefinition
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/notifications/AssetPublisherUserNotificationHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/notifications/AssetPublisherUserNotificationHandler.java
index b3a051cea03718..d03dfc627b184b 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/notifications/AssetPublisherUserNotificationHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/notifications/AssetPublisherUserNotificationHandler.java
@@ -25,7 +25,7 @@
* @author Roberto Díaz
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = UserNotificationHandler.class
)
public class AssetPublisherUserNotificationHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/AssetPublisherAddPortletProvider.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/AssetPublisherAddPortletProvider.java
index d7a00f45ce7a2c..9366a3d8e8eedf 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/AssetPublisherAddPortletProvider.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/AssetPublisherAddPortletProvider.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.portlet.PortletURLFactoryUtil;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/AssetPublisherPortlet.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/AssetPublisherPortlet.java
index 40b7e748a50905..06e11e67733851 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/AssetPublisherPortlet.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/AssetPublisherPortlet.java
@@ -73,6 +73,22 @@
import com.liferay.segments.SegmentsEntryRetriever;
import com.liferay.segments.context.RequestContextMapper;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.ResourceURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
@@ -84,22 +100,6 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.ResourceURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
@@ -124,19 +124,19 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Asset Publisher",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.supported-public-render-parameter=assetEntryId",
- "javax.portlet.supported-public-render-parameter=categoryId",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.supported-public-render-parameter=tags",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Asset Publisher",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=assetEntryId",
+ "jakarta.portlet.supported-public-render-parameter=categoryId",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.supported-public-render-parameter=tags",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/HighestRatedAssetsPortlet.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/HighestRatedAssetsPortlet.java
index 3f65e1a67581ad..835c13ec705836 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/HighestRatedAssetsPortlet.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/HighestRatedAssetsPortlet.java
@@ -7,7 +7,7 @@
import com.liferay.asset.publisher.constants.AssetPublisherPortletKeys;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -26,20 +26,20 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Highest Rated Assets",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
- "javax.portlet.preferences=classpath:/META-INF/portlet-preferences/highest-rated-assets-default-portlet-preferences.xml",
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.supported-public-render-parameter=assetEntryId",
- "javax.portlet.supported-public-render-parameter=categoryId",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.supported-public-render-parameter=tags",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Highest Rated Assets",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
+ "jakarta.portlet.preferences=classpath:/META-INF/portlet-preferences/highest-rated-assets-default-portlet-preferences.xml",
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=assetEntryId",
+ "jakarta.portlet.supported-public-render-parameter=categoryId",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.supported-public-render-parameter=tags",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/MostViewedAssetsPortlet.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/MostViewedAssetsPortlet.java
index cd71c0e5f2b054..5b23e13ebae34f 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/MostViewedAssetsPortlet.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/MostViewedAssetsPortlet.java
@@ -7,7 +7,7 @@
import com.liferay.asset.publisher.constants.AssetPublisherPortletKeys;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -26,20 +26,20 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Most Viewed Assets",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
- "javax.portlet.preferences=classpath:/META-INF/portlet-preferences/most-viewed-assets-default-portlet-preferences.xml",
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.supported-public-render-parameter=assetEntryId",
- "javax.portlet.supported-public-render-parameter=categoryId",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.supported-public-render-parameter=tags",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Most Viewed Assets",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
+ "jakarta.portlet.preferences=classpath:/META-INF/portlet-preferences/most-viewed-assets-default-portlet-preferences.xml",
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=assetEntryId",
+ "jakarta.portlet.supported-public-render-parameter=categoryId",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.supported-public-render-parameter=tags",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/RecentContentPortlet.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/RecentContentPortlet.java
index 4a9ada493895f1..df984fe9aeac3e 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/RecentContentPortlet.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/RecentContentPortlet.java
@@ -7,7 +7,7 @@
import com.liferay.asset.publisher.constants.AssetPublisherPortletKeys;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -25,19 +25,19 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Recent Content",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
- "javax.portlet.preferences=classpath:/META-INF/portlet-preferences/recent-content-default-portlet-preferences.xml",
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.supported-public-render-parameter=assetEntryId",
- "javax.portlet.supported-public-render-parameter=categoryId",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Recent Content",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
+ "jakarta.portlet.preferences=classpath:/META-INF/portlet-preferences/recent-content-default-portlet-preferences.xml",
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=assetEntryId",
+ "jakarta.portlet.supported-public-render-parameter=categoryId",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/RelatedAssetsPortlet.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/RelatedAssetsPortlet.java
index 497eb1c93e9618..2800f02b49bc14 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/RelatedAssetsPortlet.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/RelatedAssetsPortlet.java
@@ -14,15 +14,15 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.io.IOException;
import java.util.Map;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
@@ -45,19 +45,19 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=1",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Related Assets",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
- "javax.portlet.preferences=classpath:/META-INF/portlet-preferences/related-assets-default-portlet-preferences.xml",
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.supported-public-render-parameter=assetEntryId",
- "javax.portlet.supported-public-render-parameter=categoryId",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Related Assets",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ "jakarta.portlet.preferences=classpath:/META-INF/portlet-preferences/related-assets-default-portlet-preferences.xml",
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=assetEntryId",
+ "jakarta.portlet.supported-public-render-parameter=categoryId",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AddAssetListMVCActionCommand.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AddAssetListMVCActionCommand.java
index 7cf140e473f927..0100311d96919c 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AddAssetListMVCActionCommand.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AddAssetListMVCActionCommand.java
@@ -36,15 +36,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletPreferences;
+
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -53,7 +53,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
"mvc.command.name=/asset_publisher/add_asset_list"
},
service = MVCActionCommand.class
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationAction.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationAction.java
index f4362e2472a78a..7b1361c8e872a2 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationAction.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationAction.java
@@ -68,22 +68,22 @@
import com.liferay.segments.SegmentsEntryRetriever;
import com.liferay.segments.context.RequestContextMapper;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.lang.text.StrMatcher;
import org.apache.commons.lang.text.StrTokenizer;
@@ -98,7 +98,7 @@
*/
@Component(
configurationPid = "com.liferay.asset.publisher.web.internal.configuration.AssetPublisherWebConfiguration",
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = ConfigurationAction.class
)
public class AssetPublisherConfigurationAction extends BaseConfigurationAction {
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/GetFieldItemMVCResourceCommand.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/GetFieldItemMVCResourceCommand.java
index c8f6573c4139e0..aae6c8dc0171df 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/GetFieldItemMVCResourceCommand.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/GetFieldItemMVCResourceCommand.java
@@ -9,8 +9,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.BaseMVCResourceCommand;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCResourceCommand;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,11 +19,11 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
- "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
- "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
- "javax.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
- "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
"mvc.command.name=/asset_publisher/get_field_item"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/HighestRatedAssetsConfigurationAction.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/HighestRatedAssetsConfigurationAction.java
index 12ef15183902a0..9bbe5ef019de18 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/HighestRatedAssetsConfigurationAction.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/HighestRatedAssetsConfigurationAction.java
@@ -15,7 +15,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
service = ConfigurationAction.class
)
public class HighestRatedAssetsConfigurationAction
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/MostViewedAssetsConfigurationAction.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/MostViewedAssetsConfigurationAction.java
index e95123c51c9ada..b431f4278ac685 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/MostViewedAssetsConfigurationAction.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/MostViewedAssetsConfigurationAction.java
@@ -15,7 +15,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
service = ConfigurationAction.class
)
public class MostViewedAssetsConfigurationAction
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/RecentContentConfigurationAction.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/RecentContentConfigurationAction.java
index f359c360c58042..5d18f4917d791b 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/RecentContentConfigurationAction.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/RecentContentConfigurationAction.java
@@ -15,7 +15,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
service = ConfigurationAction.class
)
public class RecentContentConfigurationAction
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/RelatedAssetsConfigurationAction.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/RelatedAssetsConfigurationAction.java
index 46188d7fb7a07f..ec72b860f7a536 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/RelatedAssetsConfigurationAction.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/RelatedAssetsConfigurationAction.java
@@ -15,7 +15,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
service = ConfigurationAction.class
)
public class RelatedAssetsConfigurationAction
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/SelectStructureFieldMVCRenderCommand.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/SelectStructureFieldMVCRenderCommand.java
index 58a0841629dcba..d8837231b1f7e0 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/SelectStructureFieldMVCRenderCommand.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/action/SelectStructureFieldMVCRenderCommand.java
@@ -10,8 +10,8 @@
import com.liferay.asset.publisher.web.internal.helper.AssetPublisherWebHelper;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -21,11 +21,11 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
- "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
- "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
- "javax.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
- "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
"mvc.command.name=/asset_publisher/select_structure_field"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/AssetPublisherPortletDisplayTemplateHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/AssetPublisherPortletDisplayTemplateHandler.java
index 630e8a9d35d2b5..2c22e1ba7d6613 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/AssetPublisherPortletDisplayTemplateHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/AssetPublisherPortletDisplayTemplateHandler.java
@@ -35,7 +35,7 @@
* @author Juan Fernández
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = TemplateHandler.class
)
public class AssetPublisherPortletDisplayTemplateHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/HighestRatedAssetsPortletDisplayTemplateHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/HighestRatedAssetsPortletDisplayTemplateHandler.java
index 7e67d04d57c681..dbf9147cf650c0 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/HighestRatedAssetsPortletDisplayTemplateHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/HighestRatedAssetsPortletDisplayTemplateHandler.java
@@ -14,7 +14,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS,
service = TemplateHandler.class
)
public class HighestRatedAssetsPortletDisplayTemplateHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/MostViewedAssetsPortletDisplayTemplateHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/MostViewedAssetsPortletDisplayTemplateHandler.java
index e8be3dc4bb23a2..35906a42a1f39e 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/MostViewedAssetsPortletDisplayTemplateHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/MostViewedAssetsPortletDisplayTemplateHandler.java
@@ -14,7 +14,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS,
service = TemplateHandler.class
)
public class MostViewedAssetsPortletDisplayTemplateHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/RecentContentPortletDisplayTemplateHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/RecentContentPortletDisplayTemplateHandler.java
index ff75d9dbf8e628..537a2f6386de4c 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/RecentContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/RecentContentPortletDisplayTemplateHandler.java
@@ -14,7 +14,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT,
service = TemplateHandler.class
)
public class RecentContentPortletDisplayTemplateHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/RelatedAssetsPortletDisplayTemplateHandler.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/RelatedAssetsPortletDisplayTemplateHandler.java
index c53056285f6ac6..68d5dec96a0b7f 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/RelatedAssetsPortletDisplayTemplateHandler.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/display/template/RelatedAssetsPortletDisplayTemplateHandler.java
@@ -14,7 +14,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
service = TemplateHandler.class
)
public class RelatedAssetsPortletDisplayTemplateHandler
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/filter/AssetPublisherRenderParametersPortletFilter.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/filter/AssetPublisherRenderParametersPortletFilter.java
index ce28c37c3f05c9..2d974218b2bb98 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/filter/AssetPublisherRenderParametersPortletFilter.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/filter/AssetPublisherRenderParametersPortletFilter.java
@@ -13,17 +13,17 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.RenderParametersPool;
-import java.io.IOException;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.filter.FilterChain;
+import jakarta.portlet.filter.FilterConfig;
+import jakarta.portlet.filter.PortletFilter;
+import jakarta.portlet.filter.RenderFilter;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.filter.FilterChain;
-import javax.portlet.filter.FilterConfig;
-import javax.portlet.filter.PortletFilter;
-import javax.portlet.filter.RenderFilter;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
* @author Juergen Kappler
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = PortletFilter.class
)
public class AssetPublisherRenderParametersPortletFilter
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/filter/RelatedAssetsRenderParametersPortletFilter.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/filter/RelatedAssetsRenderParametersPortletFilter.java
index b21f29c91f266f..3948a903c2cf5e 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/filter/RelatedAssetsRenderParametersPortletFilter.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/filter/RelatedAssetsRenderParametersPortletFilter.java
@@ -12,20 +12,20 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.RenderParametersPool;
-import java.io.IOException;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.filter.FilterChain;
+import jakarta.portlet.filter.FilterConfig;
+import jakarta.portlet.filter.PortletFilter;
+import jakarta.portlet.filter.RenderFilter;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.filter.FilterChain;
-import javax.portlet.filter.FilterConfig;
-import javax.portlet.filter.PortletFilter;
-import javax.portlet.filter.RenderFilter;
+import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
* @author Preston Crary
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS,
service = PortletFilter.class
)
public class RelatedAssetsRenderParametersPortletFilter
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/layout/listener/AssetPublisherPortletLayoutListener.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/layout/listener/AssetPublisherPortletLayoutListener.java
index afe3f5b5e27e25..460cc52221387d 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/layout/listener/AssetPublisherPortletLayoutListener.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/layout/listener/AssetPublisherPortletLayoutListener.java
@@ -39,12 +39,12 @@
import com.liferay.portal.kernel.util.UnicodeProperties;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -57,7 +57,7 @@
* @author Zsolt Berentey
*/
@Component(
- property = "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ property = "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
service = PortletLayoutListener.class
)
public class AssetPublisherPortletLayoutListener
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/preferences/updater/AssetPublisherPortletPreferencesUpdater.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/preferences/updater/AssetPublisherPortletPreferencesUpdater.java
index 74cf514378c916..126253016bd23d 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/preferences/updater/AssetPublisherPortletPreferencesUpdater.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/preferences/updater/AssetPublisherPortletPreferencesUpdater.java
@@ -19,7 +19,7 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/AssetPublisherFriendlyURLMapper.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/AssetPublisherFriendlyURLMapper.java
index a63d3df249c62e..6c4a6607ac7cc7 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/AssetPublisherFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/AssetPublisherFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/HighestRatedAssetsFriendlyURLMapper.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/HighestRatedAssetsFriendlyURLMapper.java
index 32a92e7f756b69..4f33c71cc5fe91 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/HighestRatedAssetsFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/HighestRatedAssetsFriendlyURLMapper.java
@@ -16,7 +16,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.HIGHEST_RATED_ASSETS
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/MostViewedAssetsFriendlyURLMapper.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/MostViewedAssetsFriendlyURLMapper.java
index 2e47f469b9a1b5..72fad2d1df50f3 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/MostViewedAssetsFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/MostViewedAssetsFriendlyURLMapper.java
@@ -16,7 +16,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.MOST_VIEWED_ASSETS
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/RecentContentFriendlyURLMapper.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/RecentContentFriendlyURLMapper.java
index fad87d85d5158f..56fbe0766f17ec 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/RecentContentFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/RecentContentFriendlyURLMapper.java
@@ -16,7 +16,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.RECENT_CONTENT
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/RelatedAssetsFriendlyURLMapper.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/RelatedAssetsFriendlyURLMapper.java
index 73f897732e2a62..68fbb48af8933d 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/RelatedAssetsFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/route/RelatedAssetsFriendlyURLMapper.java
@@ -16,7 +16,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.RELATED_ASSETS
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/toolbar/contributor/AssetPublisherPortletToolbarContributor.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/toolbar/contributor/AssetPublisherPortletToolbarContributor.java
index 51230432a8135c..37ed7ba50c944c 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/toolbar/contributor/AssetPublisherPortletToolbarContributor.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/portlet/toolbar/contributor/AssetPublisherPortletToolbarContributor.java
@@ -31,16 +31,16 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.util.PropsValues;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,7 +49,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
+ "jakarta.portlet.name=" + AssetPublisherPortletKeys.ASSET_PUBLISHER,
"mvc.path=-", "mvc.path=/view.jsp"
},
service = PortletToolbarContributor.class
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/scheduler/helper/AssetEntriesCheckerHelper.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/scheduler/helper/AssetEntriesCheckerHelper.java
index e66c112d91fee5..6511fa5c7cb55f 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/scheduler/helper/AssetEntriesCheckerHelper.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/scheduler/helper/AssetEntriesCheckerHelper.java
@@ -69,6 +69,9 @@
import com.liferay.subscription.model.Subscription;
import com.liferay.subscription.service.SubscriptionLocalService;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletPreferences;
+
import java.io.IOException;
import java.util.ArrayList;
@@ -80,9 +83,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/servlet/taglib/util/AssetEntryActionDropdownItemsProvider.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/servlet/taglib/util/AssetEntryActionDropdownItemsProvider.java
index af1f186fe382b5..0405533ecbf1a5 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/servlet/taglib/util/AssetEntryActionDropdownItemsProvider.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/servlet/taglib/util/AssetEntryActionDropdownItemsProvider.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
index 50014352ec5e56..8dc2472ea1268a 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
@@ -27,6 +27,8 @@
import com.liferay.portal.kernel.xml.Element;
import com.liferay.portal.kernel.xml.SAXReader;
+import jakarta.portlet.PortletPreferences;
+
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -40,8 +42,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.portlet.PortletPreferences;
-
/**
* @author Sam Ziemer
*/
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_1/UpgradePortletPreferences.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_1/UpgradePortletPreferences.java
index a7f4cd475443e1..4ea12c00b6812c 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_1/UpgradePortletPreferences.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_1/UpgradePortletPreferences.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.xml.Element;
import com.liferay.portal.kernel.xml.SAXReader;
-import java.util.Objects;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.Objects;
/**
* @author Cristina Rodríguez
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_2/UpgradePortletPreferences.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_2/UpgradePortletPreferences.java
index 32cb6998dacfcc..4377b9dab3b708 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_2/UpgradePortletPreferences.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_2/UpgradePortletPreferences.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.upgrade.BasePortletPreferencesUpgradeProcess;
import com.liferay.portal.kernel.util.GetterUtil;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Cristina Rodríguez
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_3/UpgradePortletPreferences.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_3/UpgradePortletPreferences.java
index 75fb852af7ea2c..5e9545aa79d2b1 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_3/UpgradePortletPreferences.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_3/UpgradePortletPreferences.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
import com.liferay.portal.kernel.upgrade.BasePortletPreferencesUpgradeProcess;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_4/UpgradePortletPreferences.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_4/UpgradePortletPreferences.java
index 5b71bedd281272..20938d0b4dd185 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_4/UpgradePortletPreferences.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_4/UpgradePortletPreferences.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.upgrade.BasePortletPreferencesUpgradeProcess;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Sergio González
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_5/UpgradePortletPreferences.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_5/UpgradePortletPreferences.java
index 4239f49996e6fd..b050b1c101d798 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_5/UpgradePortletPreferences.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_5/UpgradePortletPreferences.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
import com.liferay.portal.kernel.upgrade.BasePortletPreferencesUpgradeProcess;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Balázs Sáfrány-Kovalik
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_6/UpgradePortletPreferences.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_6/UpgradePortletPreferences.java
index 1da7254cd3f87b..4ac67d14940ea7 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_6/UpgradePortletPreferences.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/upgrade/v1_0_6/UpgradePortletPreferences.java
@@ -18,7 +18,7 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portlet.display.template.upgrade.BaseUpgradePortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Lourdes Fernández Besada
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherCustomizer.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherCustomizer.java
index a631cb3738ec91..3d09091f358008 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherCustomizer.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherCustomizer.java
@@ -8,9 +8,9 @@
import com.liferay.asset.kernel.service.persistence.AssetEntryQuery;
import com.liferay.asset.util.AssetEntryQueryProcessor;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Pavel Savinov
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherHelperImpl.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherHelperImpl.java
index 38786f1e0b259c..c929691992cd08 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherHelperImpl.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherHelperImpl.java
@@ -73,6 +73,10 @@
import com.liferay.segments.constants.SegmentsWebKeys;
import com.liferay.segments.context.RequestContextMapper;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -86,10 +90,6 @@
import java.util.Set;
import java.util.TimeZone;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherUtil.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherUtil.java
index 90c17ba43881a2..17232e0c30bc63 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherUtil.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetPublisherUtil.java
@@ -18,7 +18,7 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Lourdes Fernández Besada
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetRendererUtil.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetRendererUtil.java
index fb1ac09e3625e5..91d6aa4692f90b 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetRendererUtil.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/AssetRendererUtil.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.service.UserLocalServiceUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/DefaultAssetPublisherCustomizer.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/DefaultAssetPublisherCustomizer.java
index 21e2231c796553..e2f413612d3789 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/DefaultAssetPublisherCustomizer.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/DefaultAssetPublisherCustomizer.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Pavel Savinov
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/HighestRatedAssetPublisherCustomizer.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/HighestRatedAssetPublisherCustomizer.java
index 139b8d568d6aa7..38422ca6c15b3a 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/HighestRatedAssetPublisherCustomizer.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/HighestRatedAssetPublisherCustomizer.java
@@ -10,9 +10,9 @@
import com.liferay.asset.publisher.web.internal.configuration.AssetPublisherWebConfiguration;
import com.liferay.portal.kernel.util.GetterUtil;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Pavel Savinov
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/MostViewedAssetPublisherCustomizer.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/MostViewedAssetPublisherCustomizer.java
index b46efad6ea487e..3dcd44e92da094 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/MostViewedAssetPublisherCustomizer.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/MostViewedAssetPublisherCustomizer.java
@@ -10,9 +10,9 @@
import com.liferay.asset.publisher.web.internal.configuration.AssetPublisherWebConfiguration;
import com.liferay.portal.kernel.util.GetterUtil;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Pavel Savinov
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/RecentContentAssetPublisherCustomizer.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/RecentContentAssetPublisherCustomizer.java
index 2e2f6ccaad951f..b0c66f7a567b03 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/RecentContentAssetPublisherCustomizer.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/RecentContentAssetPublisherCustomizer.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.util.PropsValues;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Pavel Savinov
diff --git a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/RelatedAssetPublisherCustomizer.java b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/RelatedAssetPublisherCustomizer.java
index fad7c610d92477..7966f36e849f44 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/RelatedAssetPublisherCustomizer.java
+++ b/modules/apps/asset/asset-publisher-web/src/main/java/com/liferay/asset/publisher/web/internal/util/RelatedAssetPublisherCustomizer.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.util.SetUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Set;
/**
* @author Pavel Savinov
diff --git a/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/init.jsp
index d3bb67d3ab7840..f496aa10dbcb18 100644
--- a/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/asset/asset-publisher-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -107,6 +107,8 @@ page import="com.liferay.portlet.display.template.constants.PortletDisplayTempla
page import="com.liferay.rss.util.RSSUtil" %><%@
page import="com.liferay.taglib.aui.AUIUtil" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.io.Serializable" %>
<%@ page import="java.text.Format" %>
@@ -120,8 +122,6 @@ page import="java.util.Map" %><%@
page import="java.util.Objects" %><%@
page import="java.util.Set" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/asset/asset-publisher-web/src/test/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationActionTest.java b/modules/apps/asset/asset-publisher-web/src/test/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationActionTest.java
index fc4f1657c42d7d..4ecdfd33e5116f 100644
--- a/modules/apps/asset/asset-publisher-web/src/test/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationActionTest.java
+++ b/modules/apps/asset/asset-publisher-web/src/test/java/com/liferay/asset/publisher/web/internal/portlet/action/AssetPublisherConfigurationActionTest.java
@@ -22,12 +22,12 @@
import com.liferay.portal.test.rule.LiferayUnitTestRule;
import com.liferay.portletmvc4spring.test.mock.web.portlet.MockActionRequest;
+import jakarta.portlet.PortletPreferences;
+
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-service/build.gradle b/modules/apps/asset/asset-service/build.gradle
index d806c5bf1d998f..cc214db8015ea4 100644
--- a/modules/apps/asset/asset-service/build.gradle
+++ b/modules/apps/asset/asset-service/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/info/collection/provider/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProvider.java b/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/info/collection/provider/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProvider.java
index 65695b99fbe696..2a0eb257e606cb 100644
--- a/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/info/collection/provider/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProvider.java
+++ b/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/info/collection/provider/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProvider.java
@@ -73,6 +73,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -83,8 +85,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/info/renderer/BaseAssetEntryInfoItemRenderer.java b/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/info/renderer/BaseAssetEntryInfoItemRenderer.java
index e7f0dd44688193..f264a98d19a1d1 100644
--- a/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/info/renderer/BaseAssetEntryInfoItemRenderer.java
+++ b/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/info/renderer/BaseAssetEntryInfoItemRenderer.java
@@ -12,8 +12,8 @@
import com.liferay.info.item.renderer.InfoItemRenderer;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Jorge Ferrer
diff --git a/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/search/AssetEntryIndexer.java b/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/search/AssetEntryIndexer.java
index af5a54382ad4aa..343fc72c402243 100644
--- a/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/search/AssetEntryIndexer.java
+++ b/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/search/AssetEntryIndexer.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.search.Summary;
import com.liferay.portal.kernel.search.filter.BooleanFilter;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/util/AssetHelperImpl.java b/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/util/AssetHelperImpl.java
index ef10474e91d5a8..51a7735a9a5840 100644
--- a/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/util/AssetHelperImpl.java
+++ b/modules/apps/asset/asset-service/src/main/java/com/liferay/asset/internal/util/AssetHelperImpl.java
@@ -71,6 +71,11 @@
import com.liferay.portal.search.sort.SortOrder;
import com.liferay.portal.search.sort.Sorts;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -84,11 +89,6 @@
import java.util.Set;
import java.util.TimeZone;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-taglib-test/src/testIntegration/java/com/liferay/asset/taglib/servlet/taglib/test/AssetCategoriesSelectorTagTest.java b/modules/apps/asset/asset-taglib-test/src/testIntegration/java/com/liferay/asset/taglib/servlet/taglib/test/AssetCategoriesSelectorTagTest.java
index de0df1b3d80300..c707b90f2b55df 100644
--- a/modules/apps/asset/asset-taglib-test/src/testIntegration/java/com/liferay/asset/taglib/servlet/taglib/test/AssetCategoriesSelectorTagTest.java
+++ b/modules/apps/asset/asset-taglib-test/src/testIntegration/java/com/liferay/asset/taglib/servlet/taglib/test/AssetCategoriesSelectorTagTest.java
@@ -40,9 +40,9 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-taglib/build.gradle b/modules/apps/asset/asset-taglib/build.gradle
index 9c8b0949259fbd..6c799d6648c056 100644
--- a/modules/apps/asset/asset-taglib/build.gradle
+++ b/modules/apps/asset/asset-taglib/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-api")
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/AssetCategoriesNavigationDisplayContext.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/AssetCategoriesNavigationDisplayContext.java
index fd890420fb0551..1e26b96f805d9c 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/AssetCategoriesNavigationDisplayContext.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/AssetCategoriesNavigationDisplayContext.java
@@ -30,17 +30,17 @@
import com.liferay.portlet.asset.util.comparator.AssetVocabularyGroupLocalizedTitleComparator;
import com.liferay.taglib.aui.AUIUtil;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/AssetTagsNavigationDisplayContext.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/AssetTagsNavigationDisplayContext.java
index f919557e2ed338..4e9665d9eb9f2a 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/AssetTagsNavigationDisplayContext.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/AssetTagsNavigationDisplayContext.java
@@ -24,15 +24,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Mikel Lorza
*/
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/InputAssetLinksDisplayContext.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/InputAssetLinksDisplayContext.java
index 864302fc913f5f..41ea74d5922020 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/InputAssetLinksDisplayContext.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/InputAssetLinksDisplayContext.java
@@ -44,6 +44,13 @@
import com.liferay.staging.StagingGroupHelperUtil;
import com.liferay.taglib.util.TagResourceBundleUtil;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
+
import java.io.Serializable;
import java.text.Collator;
@@ -55,13 +62,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
-
/**
* @author José Manuel Navarro
*/
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/SelectAssetDisplayPageDisplayContext.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/SelectAssetDisplayPageDisplayContext.java
index 9bc75536536f87..1a9ca606f53aa1 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/SelectAssetDisplayPageDisplayContext.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/display/context/SelectAssetDisplayPageDisplayContext.java
@@ -46,11 +46,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Pavel Savinov
*/
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/servlet/ServletContextUtil.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/servlet/ServletContextUtil.java
index 5c13f6f9202781..8ca5aefd8bf230 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/servlet/ServletContextUtil.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/servlet/ServletContextUtil.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.module.service.Snapshot;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* @author Michael Bradford
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/util/AssetCategoryUtil.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/util/AssetCategoryUtil.java
index 3c02738d00097b..183b2512dcc253 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/util/AssetCategoryUtil.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/internal/util/AssetCategoryUtil.java
@@ -18,14 +18,14 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesAvailableTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesAvailableTag.java
index 180538ce5d22fb..2a69a1ab546fa4 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesAvailableTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesAvailableTag.java
@@ -9,11 +9,11 @@
import com.liferay.asset.kernel.service.AssetCategoryServiceUtil;
import com.liferay.taglib.TagSupport;
+import jakarta.servlet.jsp.JspException;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.jsp.JspException;
-
/**
* @author Sergio González
*/
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesErrorTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesErrorTag.java
index 85efafc5f1284c..fccf65c7be7dd0 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesErrorTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesErrorTag.java
@@ -8,7 +8,7 @@
import com.liferay.asset.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Juan Fernández
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesNavigationTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesNavigationTag.java
index e4df43b88d5485..b33057272d1495 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesNavigationTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesNavigationTag.java
@@ -8,8 +8,8 @@
import com.liferay.asset.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Alvaro del Castillo
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesSelectorTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesSelectorTag.java
index 3d2ab76f71af70..ac0ecf4e3e7b50 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesSelectorTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesSelectorTag.java
@@ -50,17 +50,17 @@
import com.liferay.taglib.aui.AUIUtil;
import com.liferay.taglib.util.IncludeTag;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
-
/**
* @author Chema Balsas
* @author Carlos Lancha
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesSummaryTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesSummaryTag.java
index 9547bcb10f77d8..8da33334209ade 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesSummaryTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetCategoriesSummaryTag.java
@@ -10,13 +10,13 @@
import com.liferay.asset.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetDisplayTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetDisplayTag.java
index 2cea60aaf2c2fc..62af160967fd99 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetDisplayTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetDisplayTag.java
@@ -17,13 +17,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import java.io.IOException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.io.IOException;
/**
* @author Julio Camarero
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetLinksTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetLinksTag.java
index 1bdcb173e5d3c8..340e4f8e03138d 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetLinksTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetLinksTag.java
@@ -37,16 +37,16 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.taglib.util.IncludeTag;
-import java.util.List;
-import java.util.Objects;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
+import java.util.Objects;
/**
* @author Juan Fernández
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetMetadataTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetMetadataTag.java
index 86fa83d3f08fe0..f92bc80bf4966b 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetMetadataTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetMetadataTag.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsAvailableTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsAvailableTag.java
index ab49456060ec5f..0538ca486dc239 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsAvailableTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsAvailableTag.java
@@ -9,11 +9,11 @@
import com.liferay.asset.kernel.service.AssetTagServiceUtil;
import com.liferay.taglib.TagSupport;
+import jakarta.servlet.jsp.JspException;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.jsp.JspException;
-
/**
* @author Sergio González
*/
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsErrorTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsErrorTag.java
index 4d72818aa78729..d78c232cc58b2e 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsErrorTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsErrorTag.java
@@ -8,7 +8,7 @@
import com.liferay.asset.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsNavigationTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsNavigationTag.java
index 287cc9d65e3fd4..45f31235afb5de 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsNavigationTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsNavigationTag.java
@@ -8,8 +8,8 @@
import com.liferay.asset.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Alvaro del Castillo
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsSelectorTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsSelectorTag.java
index 16b201fded0bb1..e26f2b33e0d13f 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsSelectorTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsSelectorTag.java
@@ -29,6 +29,12 @@
import com.liferay.taglib.aui.AUIUtil;
import com.liferay.taglib.util.IncludeTag;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -36,12 +42,6 @@
import java.util.Map;
import java.util.Set;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
-
/**
* @author Antonio Pol
*/
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsSummaryTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsSummaryTag.java
index 8c568bef9c11e0..2c3fe20e468b8c 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsSummaryTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/AssetTagsSummaryTag.java
@@ -9,13 +9,13 @@
import com.liferay.asset.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/CategorizationFilterTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/CategorizationFilterTag.java
index 8f430c0a66cb05..a74b022510115f 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/CategorizationFilterTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/CategorizationFilterTag.java
@@ -8,10 +8,10 @@
import com.liferay.asset.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Julio Camarero
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/InputAssetLinksTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/InputAssetLinksTag.java
index d0e34a6af76906..3398711564774a 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/InputAssetLinksTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/InputAssetLinksTag.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Juan Fernández
diff --git a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/SelectAssetDisplayPageTag.java b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/SelectAssetDisplayPageTag.java
index ab89b7d23519cd..535b1d7c35628c 100644
--- a/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/SelectAssetDisplayPageTag.java
+++ b/modules/apps/asset/asset-taglib/src/main/java/com/liferay/asset/taglib/servlet/taglib/SelectAssetDisplayPageTag.java
@@ -8,8 +8,8 @@
import com.liferay.asset.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Pavel Savinov
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_error/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_error/init.jsp
index b70ca6e0bad14a..34e1f16ba51879 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_error/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_error/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_navigation/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_navigation/init.jsp
index d43c6b80fde740..8997ca6b52a8c7 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_navigation/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_navigation/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_selector/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_selector/init.jsp
index 5f8b24327dc0e3..2098d2f07ab811 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_selector/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_selector/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_summary/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_summary/init.jsp
index 1af71022024e86..637e72f241a1f2 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_summary/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_categories_summary/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
@@ -26,10 +26,10 @@ page import="com.liferay.portal.kernel.util.GetterUtil" %><%@
page import="com.liferay.portal.kernel.util.HtmlUtil" %><%@
page import="com.liferay.portal.kernel.util.ListUtil" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.util.ArrayList" %><%@
page import="java.util.Collections" %><%@
page import="java.util.List" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
\ No newline at end of file
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_display/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_display/init.jsp
index 50020035e5e89d..2b595d01191bba 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_display/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_display/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_links/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_links/init.jsp
index e7c5b983413f02..a94a64d2f0f954 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_links/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_links/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_metadata/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_metadata/init.jsp
index 09af508ba1c99d..9cb7918a7e20cb 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_metadata/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_metadata/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_error/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_error/init.jsp
index 69688147f592f3..a406817216751d 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_error/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_error/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_navigation/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_navigation/init.jsp
index ff9f324d81cb3c..4d592b9ece050b 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_navigation/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_navigation/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_summary/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_summary/init.jsp
index 888573546895c1..0d41d665fd19dc 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_summary/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/asset_tags_summary/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %>
@@ -19,8 +19,8 @@ page import="com.liferay.portal.kernel.util.ListUtil" %><%@
page import="com.liferay.portal.kernel.util.StringUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %>
-<%@ page import="java.util.List" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
-<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="java.util.List" %>
\ No newline at end of file
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/categorization_filter/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/categorization_filter/init.jsp
index f1b5631ee09e04..7730763a6db19b 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/categorization_filter/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/categorization_filter/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -28,7 +28,7 @@ page import="com.liferay.portal.kernel.util.ParamUtil" %><%@
page import="com.liferay.portal.kernel.util.PortalUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %>
-<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/input_asset_links/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/input_asset_links/init.jsp
index 06c7af0d858250..d78f1fb23c33a7 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/input_asset_links/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/input_asset_links/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/select_asset_display_page/init.jsp b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/select_asset_display_page/init.jsp
index fbfec1cd6ed6fb..7cfd4e205c0259 100644
--- a/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/select_asset_display_page/init.jsp
+++ b/modules/apps/asset/asset-taglib/src/main/resources/META-INF/resources/select_asset_display_page/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/asset/asset-tags-admin-web/build.gradle b/modules/apps/asset/asset-tags-admin-web/build.gradle
index 6e5b9c4ebb0d25..bdb30a2aef5417 100644
--- a/modules/apps/asset/asset-tags-admin-web/build.gradle
+++ b/modules/apps/asset/asset-tags-admin-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:asset:asset-api")
diff --git a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/application/list/AssetTagsPanelApp.java b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/application/list/AssetTagsPanelApp.java
index 5f1b22d312106d..fadb296859cbdb 100644
--- a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/application/list/AssetTagsPanelApp.java
+++ b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/application/list/AssetTagsPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + AssetTagsAdminPortletKeys.ASSET_TAGS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + AssetTagsAdminPortletKeys.ASSET_TAGS_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/change/tracking/spi/display/AssetTagCTDisplayRenderer.java b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/change/tracking/spi/display/AssetTagCTDisplayRenderer.java
index 3ac3ea30164431..6d0e5fa7477cb6 100644
--- a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/change/tracking/spi/display/AssetTagCTDisplayRenderer.java
+++ b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/change/tracking/spi/display/AssetTagCTDisplayRenderer.java
@@ -17,11 +17,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsDisplayContext.java b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsDisplayContext.java
index c7e4e109085e4f..cf1a3d426a77dd 100644
--- a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsDisplayContext.java
+++ b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsDisplayContext.java
@@ -36,13 +36,13 @@
import com.liferay.staging.StagingGroupHelper;
import com.liferay.staging.StagingGroupHelperUtil;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Juergen Kappler
diff --git a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsManagementToolbarDisplayContext.java b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsManagementToolbarDisplayContext.java
index 92b4340f9931a5..9bfd6a0fe0894c 100644
--- a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsManagementToolbarDisplayContext.java
+++ b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsManagementToolbarDisplayContext.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.asset.service.permission.AssetTagsPermission;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/portlet/AssetTagsAdminPortlet.java b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/portlet/AssetTagsAdminPortlet.java
index 13c6c0c7efadab..a8fe6fe83cca6f 100644
--- a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/portlet/AssetTagsAdminPortlet.java
+++ b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/portlet/AssetTagsAdminPortlet.java
@@ -21,14 +21,14 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.io.IOException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -47,13 +47,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Asset Tag Admin",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetTagsAdminPortletKeys.ASSET_TAGS_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Asset Tag Admin",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetTagsAdminPortletKeys.ASSET_TAGS_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/portlet/route/AssetTagsAdminFriendlyURLMapper.java b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/portlet/route/AssetTagsAdminFriendlyURLMapper.java
index 4b54103ce82230..634f53d4a25ff6 100644
--- a/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/portlet/route/AssetTagsAdminFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-tags-admin-web/src/main/java/com/liferay/asset/tags/admin/web/internal/portlet/route/AssetTagsAdminFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetTagsAdminPortletKeys.ASSET_TAGS_ADMIN
+ "jakarta.portlet.name=" + AssetTagsAdminPortletKeys.ASSET_TAGS_ADMIN
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-tags-admin-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/asset/asset-tags-admin-web/src/main/resources/META-INF/resources/init.jsp
index 1197672417c707..a9c3134262848c 100644
--- a/modules/apps/asset/asset-tags-admin-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/asset/asset-tags-admin-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -33,9 +33,9 @@ page import="com.liferay.portal.kernel.util.StringUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.site.navigation.taglib.servlet.taglib.util.BreadcrumbEntriesUtil" %>
-<%@ page import="java.util.Objects" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
-<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="java.util.Objects" %>
diff --git a/modules/apps/asset/asset-tags-admin-web/src/test/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsDisplayContextTest.java b/modules/apps/asset/asset-tags-admin-web/src/test/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsDisplayContextTest.java
index 48cf5d34da61a8..f70e8d4460f2b8 100644
--- a/modules/apps/asset/asset-tags-admin-web/src/test/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsDisplayContextTest.java
+++ b/modules/apps/asset/asset-tags-admin-web/src/test/java/com/liferay/asset/tags/admin/web/internal/display/context/AssetTagsDisplayContextTest.java
@@ -22,11 +22,11 @@
import com.liferay.staging.StagingGroupHelper;
import com.liferay.staging.StagingGroupHelperUtil;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.junit.AfterClass;
import org.junit.Assert;
diff --git a/modules/apps/asset/asset-tags-api/build.gradle b/modules/apps/asset/asset-tags-api/build.gradle
index 663ce991c70a2f..727196653eb588 100644
--- a/modules/apps/asset/asset-tags-api/build.gradle
+++ b/modules/apps/asset/asset-tags-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-api")
compileOnly project(":apps:export-import:export-import-api")
diff --git a/modules/apps/asset/asset-tags-compiler-web/build.gradle b/modules/apps/asset/asset-tags-compiler-web/build.gradle
index cd517ee9712efc..247753f9471aca 100644
--- a/modules/apps/asset/asset-tags-compiler-web/build.gradle
+++ b/modules/apps/asset/asset-tags-compiler-web/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:static:portal:portal-upgrade-api")
compileOnly project(":core:petra:petra-string")
diff --git a/modules/apps/asset/asset-tags-compiler-web/src/main/java/com/liferay/asset/tags/compiler/web/internal/portlet/AssetTagsCompilerPortlet.java b/modules/apps/asset/asset-tags-compiler-web/src/main/java/com/liferay/asset/tags/compiler/web/internal/portlet/AssetTagsCompilerPortlet.java
index 7920cf1971f162..41e437b713845c 100644
--- a/modules/apps/asset/asset-tags-compiler-web/src/main/java/com/liferay/asset/tags/compiler/web/internal/portlet/AssetTagsCompilerPortlet.java
+++ b/modules/apps/asset/asset-tags-compiler-web/src/main/java/com/liferay/asset/tags/compiler/web/internal/portlet/AssetTagsCompilerPortlet.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.model.Release;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,14 +29,14 @@
"com.liferay.portlet.show-portlet-inactive=false",
"com.liferay.portlet.system=true",
"com.liferay.portlet.use-default-template=false",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.info.keywords=Tags Compiler",
- "javax.portlet.info.short-title=Tags Compiler",
- "javax.portlet.info.title=Tags Compiler",
- "javax.portlet.name=" + AssetTagsCompilerPortletKeys.ASSET_TAGS_COMPILER,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.supported-public-render-parameter=tags",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.info.keywords=Tags Compiler",
+ "jakarta.portlet.info.short-title=Tags Compiler",
+ "jakarta.portlet.info.title=Tags Compiler",
+ "jakarta.portlet.name=" + AssetTagsCompilerPortletKeys.ASSET_TAGS_COMPILER,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.supported-public-render-parameter=tags",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-tags-compiler-web/src/main/java/com/liferay/asset/tags/compiler/web/internal/portlet/route/AssetTagsCompilerFriendlyURLMapper.java b/modules/apps/asset/asset-tags-compiler-web/src/main/java/com/liferay/asset/tags/compiler/web/internal/portlet/route/AssetTagsCompilerFriendlyURLMapper.java
index f600e08bb22f05..78c8ddaec2a9fd 100644
--- a/modules/apps/asset/asset-tags-compiler-web/src/main/java/com/liferay/asset/tags/compiler/web/internal/portlet/route/AssetTagsCompilerFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-tags-compiler-web/src/main/java/com/liferay/asset/tags/compiler/web/internal/portlet/route/AssetTagsCompilerFriendlyURLMapper.java
@@ -14,10 +14,10 @@
import com.liferay.portal.kernel.portlet.LiferayPortletURL;
import com.liferay.portal.kernel.util.StringUtil;
-import java.util.Map;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
@@ -26,7 +26,7 @@
* @author Shuyang Zhou
*/
@Component(
- property = "javax.portlet.name=" + AssetTagsCompilerPortletKeys.ASSET_TAGS_COMPILER,
+ property = "jakarta.portlet.name=" + AssetTagsCompilerPortletKeys.ASSET_TAGS_COMPILER,
service = FriendlyURLMapper.class
)
public class AssetTagsCompilerFriendlyURLMapper extends BaseFriendlyURLMapper {
diff --git a/modules/apps/asset/asset-tags-item-selector-web/build.gradle b/modules/apps/asset/asset-tags-item-selector-web/build.gradle
index 07a51d0aee11d7..204fb37490af55 100644
--- a/modules/apps/asset/asset-tags-item-selector-web/build.gradle
+++ b/modules/apps/asset/asset-tags-item-selector-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-tags-item-selector-api")
diff --git a/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/AssetTagsItemSelectorView.java b/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/AssetTagsItemSelectorView.java
index 9116ee632045c2..e21ca878270491 100644
--- a/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/AssetTagsItemSelectorView.java
+++ b/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/AssetTagsItemSelectorView.java
@@ -16,21 +16,21 @@
import com.liferay.portal.kernel.service.GroupLocalService;
import com.liferay.portal.kernel.util.JavaConstants;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/display/context/AssetTagsDisplayContext.java b/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/display/context/AssetTagsDisplayContext.java
index 26b07da196d5ad..a859f00215a93c 100644
--- a/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/display/context/AssetTagsDisplayContext.java
+++ b/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/display/context/AssetTagsDisplayContext.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.asset.util.comparator.AssetTagNameComparator;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Stefan Tanasie
diff --git a/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/search/EntriesChecker.java b/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/search/EntriesChecker.java
index 56ecb6904cceeb..3537220a50da7b 100644
--- a/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/search/EntriesChecker.java
+++ b/modules/apps/asset/asset-tags-item-selector-web/src/main/java/com/liferay/asset/tags/item/selector/web/internal/search/EntriesChecker.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.ArrayUtil;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-tags-navigation-web/build.gradle b/modules/apps/asset/asset-tags-navigation-web/build.gradle
index 2be4fd2a54e21f..603f8070537d44 100644
--- a/modules/apps/asset/asset-tags-navigation-web/build.gradle
+++ b/modules/apps/asset/asset-tags-navigation-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-api")
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/display/context/AssetTagsNavigationDisplayContext.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/display/context/AssetTagsNavigationDisplayContext.java
index 7c7aa4f9f9da0d..bcaa89e4fbe309 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/display/context/AssetTagsNavigationDisplayContext.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/display/context/AssetTagsNavigationDisplayContext.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.util.PrefsParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.RenderRequest;
-
/**
* @author Vendel Toreki
*/
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/exportimport/portlet/preferences/processor/AssetTagsCloudExportImportPortletPreferencesProcessor.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/exportimport/portlet/preferences/processor/AssetTagsCloudExportImportPortletPreferencesProcessor.java
index 400971bea66958..59d8f8c26484aa 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/exportimport/portlet/preferences/processor/AssetTagsCloudExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/exportimport/portlet/preferences/processor/AssetTagsCloudExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Jürgen Kappler
*/
@Component(
- property = "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD,
+ property = "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD,
service = ExportImportPortletPreferencesProcessor.class
)
public class AssetTagsCloudExportImportPortletPreferencesProcessor
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/exportimport/portlet/preferences/processor/AssetTagsNavigationExportImportPortletPreferencesProcessor.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/exportimport/portlet/preferences/processor/AssetTagsNavigationExportImportPortletPreferencesProcessor.java
index a0c12f64440b60..760caf76aea926 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/exportimport/portlet/preferences/processor/AssetTagsNavigationExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/exportimport/portlet/preferences/processor/AssetTagsNavigationExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Jürgen Kappler
*/
@Component(
- property = "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION,
+ property = "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION,
service = ExportImportPortletPreferencesProcessor.class
)
public class AssetTagsNavigationExportImportPortletPreferencesProcessor
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/AssetTagsCloudPortlet.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/AssetTagsCloudPortlet.java
index 06b646b4a5a47d..d0d0751fcd4383 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/AssetTagsCloudPortlet.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/AssetTagsCloudPortlet.java
@@ -12,12 +12,12 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -38,17 +38,17 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Asset Tags Cloud",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD,
- "javax.portlet.preferences=classpath:/META-INF/portlet-preferences/default-portlet-preferences.xml",
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Asset Tags Cloud",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD,
+ "jakarta.portlet.preferences=classpath:/META-INF/portlet-preferences/default-portlet-preferences.xml",
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/AssetTagsNavigationPortlet.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/AssetTagsNavigationPortlet.java
index 8b460216f8406b..da188ebcd1e1cd 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/AssetTagsNavigationPortlet.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/AssetTagsNavigationPortlet.java
@@ -12,12 +12,12 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -39,16 +39,16 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Asset Tags Navigation",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Asset Tags Navigation",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/action/AssetTagsCloudConfigurationAction.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/action/AssetTagsCloudConfigurationAction.java
index af0d4de576a23f..7de7636dccf476 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/action/AssetTagsCloudConfigurationAction.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/action/AssetTagsCloudConfigurationAction.java
@@ -15,7 +15,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD,
+ property = "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD,
service = ConfigurationAction.class
)
public class AssetTagsCloudConfigurationAction
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/action/AssetTagsNavigationConfigurationAction.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/action/AssetTagsNavigationConfigurationAction.java
index faaac237078ec3..7bc2feecdc605a 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/action/AssetTagsNavigationConfigurationAction.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/action/AssetTagsNavigationConfigurationAction.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.portlet.ConfigurationAction;
import com.liferay.portal.kernel.portlet.DefaultConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
@@ -17,7 +17,7 @@
* @author Eudaldo Alonso
*/
@Component(
- property = "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION,
+ property = "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION,
service = ConfigurationAction.class
)
public class AssetTagsNavigationConfigurationAction
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/display/template/AssetTagsCloudPortletDisplayTemplateHandler.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/display/template/AssetTagsCloudPortletDisplayTemplateHandler.java
index fab74dc5aee4ec..952a0132977ecf 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/display/template/AssetTagsCloudPortletDisplayTemplateHandler.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/display/template/AssetTagsCloudPortletDisplayTemplateHandler.java
@@ -19,7 +19,7 @@
* @author Jürgen Kappler
*/
@Component(
- property = "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD,
+ property = "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD,
service = TemplateHandler.class
)
public class AssetTagsCloudPortletDisplayTemplateHandler
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/display/template/AssetTagsNavigationPortletDisplayTemplateHandler.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/display/template/AssetTagsNavigationPortletDisplayTemplateHandler.java
index 6111701d7e0548..a5ca7fe2b3d475 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/display/template/AssetTagsNavigationPortletDisplayTemplateHandler.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/display/template/AssetTagsNavigationPortletDisplayTemplateHandler.java
@@ -27,7 +27,7 @@
* @author Juan Fernández
*/
@Component(
- property = "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION,
+ property = "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION,
service = TemplateHandler.class
)
public class AssetTagsNavigationPortletDisplayTemplateHandler
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/route/AssetTagsCloudFriendlyURLMapper.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/route/AssetTagsCloudFriendlyURLMapper.java
index 8f58eea59e21a9..0f5ddf2884e30d 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/route/AssetTagsCloudFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/route/AssetTagsCloudFriendlyURLMapper.java
@@ -16,7 +16,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD
+ "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_CLOUD
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/route/AssetTagsNavigationFriendlyURLMapper.java b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/route/AssetTagsNavigationFriendlyURLMapper.java
index 32619950cf52f4..157f63908f7e15 100644
--- a/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/route/AssetTagsNavigationFriendlyURLMapper.java
+++ b/modules/apps/asset/asset-tags-navigation-web/src/main/java/com/liferay/asset/tags/navigation/web/internal/portlet/route/AssetTagsNavigationFriendlyURLMapper.java
@@ -16,7 +16,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION
+ "jakarta.portlet.name=" + AssetTagsNavigationPortletKeys.ASSET_TAGS_NAVIGATION
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/asset/asset-tags-service/build.gradle b/modules/apps/asset/asset-tags-service/build.gradle
index 27aeb59119e917..b50cd7c25c8bde 100644
--- a/modules/apps/asset/asset-tags-service/build.gradle
+++ b/modules/apps/asset/asset-tags-service/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-api")
diff --git a/modules/apps/asset/asset-tags-service/src/main/java/com/liferay/asset/tags/internal/exportimport/data/handler/AssetTagsPortletDataHandler.java b/modules/apps/asset/asset-tags-service/src/main/java/com/liferay/asset/tags/internal/exportimport/data/handler/AssetTagsPortletDataHandler.java
index 1887fae191c04e..31f0bc3f87e4fc 100644
--- a/modules/apps/asset/asset-tags-service/src/main/java/com/liferay/asset/tags/internal/exportimport/data/handler/AssetTagsPortletDataHandler.java
+++ b/modules/apps/asset/asset-tags-service/src/main/java/com/liferay/asset/tags/internal/exportimport/data/handler/AssetTagsPortletDataHandler.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.module.framework.ModuleServiceLifecycle;
import com.liferay.portal.kernel.xml.Element;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -33,7 +33,7 @@
* @author Daniel Kocsis
*/
@Component(
- property = "javax.portlet.name=" + AssetTagsAdminPortletKeys.ASSET_TAGS_ADMIN,
+ property = "jakarta.portlet.name=" + AssetTagsAdminPortletKeys.ASSET_TAGS_ADMIN,
service = PortletDataHandler.class
)
public class AssetTagsPortletDataHandler extends BasePortletDataHandler {
diff --git a/modules/apps/asset/asset-tags-test/src/testIntegration/java/com/liferay/asset/tags/admin/web/internal/portlet/test/AssetTagsAdminPortletTest.java b/modules/apps/asset/asset-tags-test/src/testIntegration/java/com/liferay/asset/tags/admin/web/internal/portlet/test/AssetTagsAdminPortletTest.java
index 658064ad0080f8..4c4443d044c3ca 100644
--- a/modules/apps/asset/asset-tags-test/src/testIntegration/java/com/liferay/asset/tags/admin/web/internal/portlet/test/AssetTagsAdminPortletTest.java
+++ b/modules/apps/asset/asset-tags-test/src/testIntegration/java/com/liferay/asset/tags/admin/web/internal/portlet/test/AssetTagsAdminPortletTest.java
@@ -26,9 +26,9 @@
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
import com.liferay.portletmvc4spring.test.mock.web.portlet.MockActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Portlet;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/asset/asset-tags-test/src/testIntegration/java/com/liferay/asset/tags/service/test/TestAssetIndexer.java b/modules/apps/asset/asset-tags-test/src/testIntegration/java/com/liferay/asset/tags/service/test/TestAssetIndexer.java
index 530959f1ed720f..f0b0a119a48ca1 100644
--- a/modules/apps/asset/asset-tags-test/src/testIntegration/java/com/liferay/asset/tags/service/test/TestAssetIndexer.java
+++ b/modules/apps/asset/asset-tags-test/src/testIntegration/java/com/liferay/asset/tags/service/test/TestAssetIndexer.java
@@ -10,10 +10,10 @@
import com.liferay.portal.kernel.search.Document;
import com.liferay.portal.kernel.search.Summary;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.junit.Assert;
diff --git a/modules/apps/asset/asset-test-util/build.gradle b/modules/apps/asset/asset-test-util/build.gradle
index ba37c398b627e7..a169617089c5ba 100644
--- a/modules/apps/asset/asset-test-util/build.gradle
+++ b/modules/apps/asset/asset-test-util/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.test", version: "default"
compileOnly group: "commons-lang", name: "commons-lang", version: "2.6"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-api")
diff --git a/modules/apps/asset/asset-test-util/src/main/java/com/liferay/asset/test/util/asset/renderer/factory/TestAssetRendererFactory.java b/modules/apps/asset/asset-test-util/src/main/java/com/liferay/asset/test/util/asset/renderer/factory/TestAssetRendererFactory.java
index 2485bb0056c907..30be28d772e364 100644
--- a/modules/apps/asset/asset-test-util/src/main/java/com/liferay/asset/test/util/asset/renderer/factory/TestAssetRendererFactory.java
+++ b/modules/apps/asset/asset-test-util/src/main/java/com/liferay/asset/test/util/asset/renderer/factory/TestAssetRendererFactory.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.security.permission.PermissionChecker;
-import java.util.Locale;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/info/collection/provider/test/AssetInfoCollectionProviderTest.java b/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/info/collection/provider/test/AssetInfoCollectionProviderTest.java
index 52fc51db0f3b30..42785fa6b2105b 100644
--- a/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/info/collection/provider/test/AssetInfoCollectionProviderTest.java
+++ b/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/info/collection/provider/test/AssetInfoCollectionProviderTest.java
@@ -40,9 +40,9 @@
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
import com.liferay.ratings.kernel.service.RatingsEntryLocalService;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.junit.After;
import org.junit.Assert;
diff --git a/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/info/list/renderer/test/AssetInfoListRendererTest.java b/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/info/list/renderer/test/AssetInfoListRendererTest.java
index 4aad7318172463..84e0740b6fb090 100644
--- a/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/info/list/renderer/test/AssetInfoListRendererTest.java
+++ b/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/info/list/renderer/test/AssetInfoListRendererTest.java
@@ -41,11 +41,11 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.hamcrest.CoreMatchers;
import org.junit.After;
diff --git a/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/internal/info/collection/provider/test/AssetEntriesWithAssetCategoriesInTheSameAssetVocabulariesRelatedInfoItemCollectionProviderTest.java b/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/internal/info/collection/provider/test/AssetEntriesWithAssetCategoriesInTheSameAssetVocabulariesRelatedInfoItemCollectionProviderTest.java
index 8a05a2536760cc..251e0e0eb45d2e 100644
--- a/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/internal/info/collection/provider/test/AssetEntriesWithAssetCategoriesInTheSameAssetVocabulariesRelatedInfoItemCollectionProviderTest.java
+++ b/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/internal/info/collection/provider/test/AssetEntriesWithAssetCategoriesInTheSameAssetVocabulariesRelatedInfoItemCollectionProviderTest.java
@@ -48,11 +48,11 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/internal/info/collection/provider/test/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProviderTest.java b/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/internal/info/collection/provider/test/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProviderTest.java
index f477f72f9040f9..916bbcbbd8fae2 100644
--- a/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/internal/info/collection/provider/test/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProviderTest.java
+++ b/modules/apps/asset/asset-test/src/testIntegration/java/com/liferay/asset/internal/info/collection/provider/test/AssetEntriesWithSameAssetCategoryRelatedInfoItemCollectionProviderTest.java
@@ -54,12 +54,12 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/asset/asset-vocabulary-item-selector-web/build.gradle b/modules/apps/asset/asset-vocabulary-item-selector-web/build.gradle
index 8a1f7f1653e275..82331020056579 100644
--- a/modules/apps/asset/asset-vocabulary-item-selector-web/build.gradle
+++ b/modules/apps/asset/asset-vocabulary-item-selector-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-taglib")
diff --git a/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemDescriptor.java b/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemDescriptor.java
index 99985b896846fb..d6623aaafc9286 100644
--- a/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemDescriptor.java
+++ b/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemDescriptor.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Date;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemSelectorView.java b/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemSelectorView.java
index 17e4cb5c982ad2..7a1df6796d3aba 100644
--- a/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemSelectorView.java
+++ b/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemSelectorView.java
@@ -12,19 +12,19 @@
import com.liferay.item.selector.ItemSelectorViewDescriptorRenderer;
import com.liferay.portal.kernel.language.Language;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemSelectorViewDescriptor.java b/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemSelectorViewDescriptor.java
index 581f6cbd4547a2..75f73817427fdf 100644
--- a/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemSelectorViewDescriptor.java
+++ b/modules/apps/asset/asset-vocabulary-item-selector-web/src/main/java/com/liferay/asset/vocabulary/item/selector/web/internal/AssetVocabularyItemSelectorViewDescriptor.java
@@ -28,13 +28,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.asset.util.comparator.AssetVocabularyGroupLocalizedTitleComparator;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/asset/asset-web/build.gradle b/modules/apps/asset/asset-web/build.gradle
index 144505b2c1c0cd..0bd90ed91a5e20 100644
--- a/modules/apps/asset/asset-web/build.gradle
+++ b/modules/apps/asset/asset-web/build.gradle
@@ -1,6 +1,6 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-api")
compileOnly project(":apps:change-tracking:change-tracking-spi")
diff --git a/modules/apps/asset/asset-web/src/main/java/com/liferay/asset/web/internal/portlet/AssetPortlet.java b/modules/apps/asset/asset-web/src/main/java/com/liferay/asset/web/internal/portlet/AssetPortlet.java
index 4727abd131d423..8ec7df055f282b 100644
--- a/modules/apps/asset/asset-web/src/main/java/com/liferay/asset/web/internal/portlet/AssetPortlet.java
+++ b/modules/apps/asset/asset-web/src/main/java/com/liferay/asset/web/internal/portlet/AssetPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.asset.constants.AssetPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -25,11 +25,12 @@
"com.liferay.portlet.struts-path=asset",
"com.liferay.portlet.system=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Asset", "javax.portlet.expiration-cache=0",
- "javax.portlet.name=" + AssetPortletKeys.ASSET,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Asset",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.name=" + AssetPortletKeys.ASSET,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/batch-engine/batch-engine-api/build.gradle b/modules/apps/batch-engine/batch-engine-api/build.gradle
index 427c08cf343eb9..9562b725a6b9fa 100644
--- a/modules/apps/batch-engine/batch-engine-api/build.gradle
+++ b/modules/apps/batch-engine/batch-engine-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation", version: "6.0.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:portal-odata:portal-odata-api")
diff --git a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/BaseBatchEngineTaskItemDelegate.java b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/BaseBatchEngineTaskItemDelegate.java
index 36ddf50d92c27e..1d709408b582b2 100644
--- a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/BaseBatchEngineTaskItemDelegate.java
+++ b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/BaseBatchEngineTaskItemDelegate.java
@@ -11,6 +11,8 @@
import com.liferay.portal.kernel.util.SetUtil;
import com.liferay.portal.odata.entity.EntityModel;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -19,8 +21,6 @@
import java.util.Map;
import java.util.Set;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Ivica Cardic
* @author Igor Beslic
diff --git a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/BatchEngineTaskItemDelegate.java b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/BatchEngineTaskItemDelegate.java
index d3091fa3a88665..5cc96f8e7aad7f 100644
--- a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/BatchEngineTaskItemDelegate.java
+++ b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/BatchEngineTaskItemDelegate.java
@@ -14,6 +14,8 @@
import com.liferay.portal.kernel.search.filter.Filter;
import com.liferay.portal.odata.entity.EntityModel;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -21,8 +23,6 @@
import java.util.Map;
import java.util.Set;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/jaxrs/uri/BatchEngineUriInfo.java b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/jaxrs/uri/BatchEngineUriInfo.java
index 0946578f59b7d6..ed6ea9a6f0d8e9 100644
--- a/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/jaxrs/uri/BatchEngineUriInfo.java
+++ b/modules/apps/batch-engine/batch-engine-api/src/main/java/com/liferay/batch/engine/jaxrs/uri/BatchEngineUriInfo.java
@@ -5,17 +5,17 @@
package com.liferay.batch.engine.jaxrs.uri;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.net.URI;
import java.util.Collections;
import java.util.List;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Igor Beslic
*/
diff --git a/modules/apps/batch-engine/batch-engine-service/build.gradle b/modules/apps/batch-engine/batch-engine-service/build.gradle
index 6060b05c6b0d56..4eb69e841c239d 100644
--- a/modules/apps/batch-engine/batch-engine-service/build.gradle
+++ b/modules/apps/batch-engine/batch-engine-service/build.gradle
@@ -6,12 +6,12 @@ dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.zaxxer", name: "SparseBitSet", version: "1.2"
compileOnly group: "commons-io", name: "commons-io", version: "2.15.1"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
compileOnly group: "org.apache.commons", name: "commons-collections4", version: "4.4"
compileOnly group: "org.apache.commons", name: "commons-compress", version: "1.26.0"
compileOnly group: "org.apache.commons", name: "commons-csv", version: "1.9.0"
diff --git a/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/internal/exportimport/data/handler/BatchEnginePortletDataHandler.java b/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/internal/exportimport/data/handler/BatchEnginePortletDataHandler.java
index b2a114dfd0e8f4..57e9f583cfbb63 100644
--- a/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/internal/exportimport/data/handler/BatchEnginePortletDataHandler.java
+++ b/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/internal/exportimport/data/handler/BatchEnginePortletDataHandler.java
@@ -30,6 +30,8 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.MapUtil;
+import jakarta.portlet.PortletPreferences;
+
import java.io.InputStream;
import java.io.Serializable;
@@ -37,8 +39,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import javax.portlet.PortletPreferences;
-
/**
* @author Vendel Toreki
* @author Alejandro Tardín
diff --git a/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/internal/exportimport/data/handler/BatchEnginePortletDataHandlerRegistry.java b/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/internal/exportimport/data/handler/BatchEnginePortletDataHandlerRegistry.java
index 08c6779b8e4fbb..558c14a64e2038 100644
--- a/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/internal/exportimport/data/handler/BatchEnginePortletDataHandlerRegistry.java
+++ b/modules/apps/batch-engine/batch-engine-service/src/main/java/com/liferay/batch/engine/internal/exportimport/data/handler/BatchEnginePortletDataHandlerRegistry.java
@@ -110,7 +110,7 @@ public ServiceRegistration addingService(
return _bundleContext.registerService(
PortletDataHandler.class, batchEnginePortletDataHandler,
HashMapDictionaryBuilder.put(
- "javax.portlet.name",
+ "jakarta.portlet.name",
(String)serviceReference.getProperty(
"batch.engine.task.item.delegate.portlet.id")
).build());
diff --git a/modules/apps/batch-engine/batch-engine-test/build.gradle b/modules/apps/batch-engine/batch-engine-test/build.gradle
index a7e0d338d4b4fb..f38115abc94663 100644
--- a/modules/apps/batch-engine/batch-engine-test/build.gradle
+++ b/modules/apps/batch-engine/batch-engine-test/build.gradle
@@ -2,8 +2,8 @@ dependencies {
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
+ testIntegrationImplementation group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
testIntegrationImplementation group: "org.apache.commons", name: "commons-collections4", version: "4.4"
testIntegrationImplementation group: "org.apache.commons", name: "commons-compress", version: "1.26.0"
testIntegrationImplementation group: "org.apache.poi", name: "poi", version: "5.2.2"
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/bnd.bnd b/modules/apps/batch-planner/batch-planner-rest-api/bnd.bnd
index 7e3ce251b434a2..7275ed667c0aef 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/bnd.bnd
+++ b/modules/apps/batch-planner/batch-planner-rest-api/bnd.bnd
@@ -1,6 +1,6 @@
Bundle-Name: Liferay Batch Planner REST API
Bundle-SymbolicName: com.liferay.batch.planner.rest.api
-Bundle-Version: 5.2.2
+Bundle-Version: 6.0.0
Export-Package:\
com.liferay.batch.planner.rest.dto.v1_0,\
com.liferay.batch.planner.rest.resource.v1_0
\ No newline at end of file
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/build.gradle b/modules/apps/batch-planner/batch-planner-rest-api/build.gradle
index 783748a008fb77..1907a646887e6e 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/build.gradle
+++ b/modules/apps/batch-planner/batch-planner-rest-api/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:portal-odata:portal-odata-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Field.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Field.java
index 173309c6a186df..ca6deb325dcdcf 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Field.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Field.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Mapping.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Mapping.java
index 40c2ed6ee07767..2e3442c039de5b 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Mapping.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Mapping.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Plan.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Plan.java
index 3e9e57b609f29a..14be1e033f1e4d 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Plan.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Plan.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Policy.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Policy.java
index 91bee7c6daccfa..f0399600d247c1 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Policy.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Policy.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/SiteScope.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/SiteScope.java
index 6139b290509f21..166e2535a34d33 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/SiteScope.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/SiteScope.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Strategy.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Strategy.java
index 057ce71a4f8342..d420f892239910 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Strategy.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/dto/v1_0/Strategy.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/FieldResource.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/FieldResource.java
index b9a6848c062295..7735317dfdf730 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/FieldResource.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/FieldResource.java
@@ -16,18 +16,18 @@
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
import com.liferay.portal.vulcan.pagination.Page;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/PlanResource.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/PlanResource.java
index 36c063a839c1d4..4a4f3a169f0405 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/PlanResource.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/PlanResource.java
@@ -17,19 +17,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/SiteScopeResource.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/SiteScopeResource.java
index 3cd5176e2e1070..f9237f2ce9fa33 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/SiteScopeResource.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/SiteScopeResource.java
@@ -16,18 +16,18 @@
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
import com.liferay.portal.vulcan.pagination.Page;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/StrategyResource.java b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/StrategyResource.java
index fd782ec74241cf..78524af871edd3 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/StrategyResource.java
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/java/com/liferay/batch/planner/rest/resource/v1_0/StrategyResource.java
@@ -16,18 +16,18 @@
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
import com.liferay.portal.vulcan.pagination.Page;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/resources/com/liferay/batch/planner/rest/dto/v1_0/packageinfo b/modules/apps/batch-planner/batch-planner-rest-api/src/main/resources/com/liferay/batch/planner/rest/dto/v1_0/packageinfo
index a13a0cf8a3209c..1eb9c3f05cc56b 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/resources/com/liferay/batch/planner/rest/dto/v1_0/packageinfo
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/resources/com/liferay/batch/planner/rest/dto/v1_0/packageinfo
@@ -1 +1 @@
-version 2.6.0
\ No newline at end of file
+version 2.6.1
\ No newline at end of file
diff --git a/modules/apps/batch-planner/batch-planner-rest-api/src/main/resources/com/liferay/batch/planner/rest/resource/v1_0/packageinfo b/modules/apps/batch-planner/batch-planner-rest-api/src/main/resources/com/liferay/batch/planner/rest/resource/v1_0/packageinfo
index dde115d61ba0bb..3bfba5374021c0 100644
--- a/modules/apps/batch-planner/batch-planner-rest-api/src/main/resources/com/liferay/batch/planner/rest/resource/v1_0/packageinfo
+++ b/modules/apps/batch-planner/batch-planner-rest-api/src/main/resources/com/liferay/batch/planner/rest/resource/v1_0/packageinfo
@@ -1 +1 @@
-version 5.0.0
\ No newline at end of file
+version 6.0.0
\ No newline at end of file
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/build.gradle b/modules/apps/batch-planner/batch-planner-rest-client/build.gradle
index b802e77531117e..1c5c01ff57416f 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/build.gradle
+++ b/modules/apps/batch-planner/batch-planner-rest-client/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
}
\ No newline at end of file
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/aggregation/Aggregation.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/aggregation/Aggregation.java
index 6c2a6be395d838..4f5b0c395a3ef4 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/aggregation/Aggregation.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/aggregation/Aggregation.java
@@ -5,11 +5,11 @@
package com.liferay.batch.planner.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/aggregation/Facet.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/aggregation/Facet.java
index 82106901c8dbec..5d81f89ba636d8 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/aggregation/Facet.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/aggregation/Facet.java
@@ -5,11 +5,11 @@
package com.liferay.batch.planner.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Field.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Field.java
index 80bf9c433fdfb2..fdb290bacac346 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Field.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Field.java
@@ -8,12 +8,12 @@
import com.liferay.batch.planner.rest.client.function.UnsafeSupplier;
import com.liferay.batch.planner.rest.client.serdes.v1_0.FieldSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Mapping.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Mapping.java
index 49ac8495b6793d..bcc0ad4a1a02c4 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Mapping.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Mapping.java
@@ -8,12 +8,12 @@
import com.liferay.batch.planner.rest.client.function.UnsafeSupplier;
import com.liferay.batch.planner.rest.client.serdes.v1_0.MappingSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Plan.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Plan.java
index 84b241a2499f6e..bbfc97f1769779 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Plan.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Plan.java
@@ -8,12 +8,12 @@
import com.liferay.batch.planner.rest.client.function.UnsafeSupplier;
import com.liferay.batch.planner.rest.client.serdes.v1_0.PlanSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Policy.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Policy.java
index 20c1258d52d202..240ea16b368847 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Policy.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Policy.java
@@ -8,12 +8,12 @@
import com.liferay.batch.planner.rest.client.function.UnsafeSupplier;
import com.liferay.batch.planner.rest.client.serdes.v1_0.PolicySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/SiteScope.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/SiteScope.java
index 2519db3fe4660d..dc77a693e6a248 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/SiteScope.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/SiteScope.java
@@ -8,12 +8,12 @@
import com.liferay.batch.planner.rest.client.function.UnsafeSupplier;
import com.liferay.batch.planner.rest.client.serdes.v1_0.SiteScopeSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Strategy.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Strategy.java
index e13293112098f6..ea7e45b17ba8ef 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Strategy.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/dto/v1_0/Strategy.java
@@ -8,12 +8,12 @@
import com.liferay.batch.planner.rest.client.function.UnsafeSupplier;
import com.liferay.batch.planner.rest.client.serdes.v1_0.StrategySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/function/UnsafeSupplier.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/function/UnsafeSupplier.java
index 1ef3be1b790804..2b0c88aeb00ecb 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/function/UnsafeSupplier.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/function/UnsafeSupplier.java
@@ -5,7 +5,7 @@
package com.liferay.batch.planner.rest.client.function;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/http/HttpInvoker.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/http/HttpInvoker.java
index 6c7b88b9cbf01f..d4c8e1784b7bc7 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/http/HttpInvoker.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/http/HttpInvoker.java
@@ -5,6 +5,8 @@
package com.liferay.batch.planner.rest.client.http;
+import jakarta.annotation.Generated;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -29,8 +31,6 @@
import java.util.Set;
import java.util.regex.Matcher;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/json/BaseJSONParser.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/json/BaseJSONParser.java
index 3267cd736b08f0..dca902e9e35254 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/json/BaseJSONParser.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/json/BaseJSONParser.java
@@ -5,6 +5,8 @@
package com.liferay.batch.planner.rest.client.json;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -18,8 +20,6 @@
import java.util.Stack;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/pagination/Page.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/pagination/Page.java
index e4ae8efd2e6697..36fc1cbb1936b5 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/pagination/Page.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/pagination/Page.java
@@ -8,6 +8,8 @@
import com.liferay.batch.planner.rest.client.aggregation.Facet;
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/pagination/Pagination.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/pagination/Pagination.java
index 6fc8f3f6056d88..def559bc62d2ab 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/pagination/Pagination.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/pagination/Pagination.java
@@ -5,7 +5,7 @@
package com.liferay.batch.planner.rest.client.pagination;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/permission/Permission.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/permission/Permission.java
index 7d45dd887f2fa0..0609ad457423de 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/permission/Permission.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/permission/Permission.java
@@ -7,9 +7,9 @@
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/problem/Problem.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/problem/Problem.java
index 5e35e9fa565fc7..6c6fb968754eeb 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/problem/Problem.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/problem/Problem.java
@@ -7,9 +7,9 @@
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/FieldResource.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/FieldResource.java
index 0b2de9e42a4d02..41d946883004c0 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/FieldResource.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/FieldResource.java
@@ -11,6 +11,8 @@
import com.liferay.batch.planner.rest.client.problem.Problem;
import com.liferay.batch.planner.rest.client.serdes.v1_0.FieldSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -20,8 +22,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/PlanResource.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/PlanResource.java
index 62ec55e19e5579..e06203fead97c0 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/PlanResource.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/PlanResource.java
@@ -12,6 +12,8 @@
import com.liferay.batch.planner.rest.client.problem.Problem;
import com.liferay.batch.planner.rest.client.serdes.v1_0.PlanSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/SiteScopeResource.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/SiteScopeResource.java
index 8c3352e226fd5c..b108914b0e5449 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/SiteScopeResource.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/SiteScopeResource.java
@@ -11,6 +11,8 @@
import com.liferay.batch.planner.rest.client.problem.Problem;
import com.liferay.batch.planner.rest.client.serdes.v1_0.SiteScopeSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -20,8 +22,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/StrategyResource.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/StrategyResource.java
index 5f90c67d026725..b9f0ecff4fe9f9 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/StrategyResource.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/resource/v1_0/StrategyResource.java
@@ -11,6 +11,8 @@
import com.liferay.batch.planner.rest.client.problem.Problem;
import com.liferay.batch.planner.rest.client.serdes.v1_0.StrategySerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -20,8 +22,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/FieldSerDes.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/FieldSerDes.java
index a6e9786a30a438..60d397239a791a 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/FieldSerDes.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/FieldSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.batch.planner.rest.client.dto.v1_0.Field;
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/MappingSerDes.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/MappingSerDes.java
index a06cd3cc9b2ea0..319355bd087387 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/MappingSerDes.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/MappingSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.batch.planner.rest.client.dto.v1_0.Mapping;
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/PlanSerDes.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/PlanSerDes.java
index 7935799d7dbd5b..4327388a280a9c 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/PlanSerDes.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/PlanSerDes.java
@@ -10,14 +10,14 @@
import com.liferay.batch.planner.rest.client.dto.v1_0.Policy;
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/PolicySerDes.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/PolicySerDes.java
index 52ba8f9bd4ceba..7706dcf67e8aa9 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/PolicySerDes.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/PolicySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.batch.planner.rest.client.dto.v1_0.Policy;
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/SiteScopeSerDes.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/SiteScopeSerDes.java
index 5e7c99a8024a02..8cee9a2ffc7462 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/SiteScopeSerDes.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/SiteScopeSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.batch.planner.rest.client.dto.v1_0.SiteScope;
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/StrategySerDes.java b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/StrategySerDes.java
index 4b3977537f8bc8..28d00b49f9abfb 100644
--- a/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/StrategySerDes.java
+++ b/modules/apps/batch-planner/batch-planner-rest-client/src/main/java/com/liferay/batch/planner/rest/client/serdes/v1_0/StrategySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.batch.planner.rest.client.dto.v1_0.Strategy;
import com.liferay.batch.planner.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Matija Petanjek
* @generated
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/build.gradle b/modules/apps/batch-planner/batch-planner-rest-impl/build.gradle
index 73c698fa19c4bb..8bc231d65a8635 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/build.gradle
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/jaxrs/application/BatchPlannerRESTApplication.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/jaxrs/application/BatchPlannerRESTApplication.java
index 3a7e85645991d9..8f859a5186ab52 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/jaxrs/application/BatchPlannerRESTApplication.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/jaxrs/application/BatchPlannerRESTApplication.java
@@ -5,9 +5,9 @@
package com.liferay.batch.planner.rest.internal.jaxrs.application;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.core.Application;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseFieldResourceImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseFieldResourceImpl.java
index 8925f984d9b76e..4b8c1f0cf1ce13 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseFieldResourceImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseFieldResourceImpl.java
@@ -23,24 +23,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Matija Petanjek
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseFieldResourceImpl implements FieldResource {
/**
@@ -63,17 +63,17 @@ public abstract class BaseFieldResourceImpl implements FieldResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Field")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/plans/{internalClassNameKey}/fields")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/plans/{internalClassNameKey}/fields")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getPlanInternalClassNameKeyFieldsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("internalClassNameKey")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("internalClassNameKey")
String internalClassNameKey,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("export")
+ @jakarta.ws.rs.QueryParam("export")
Boolean export)
throws Exception {
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BasePlanResourceImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BasePlanResourceImpl.java
index adb45d5e835d1e..b0b08029bb109a 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BasePlanResourceImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BasePlanResourceImpl.java
@@ -25,25 +25,25 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Matija Petanjek
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BasePlanResourceImpl
implements PlanResource, VulcanCRUDItemDelegate {
@@ -67,12 +67,12 @@ public abstract class BasePlanResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Plan")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/plans")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/plans")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getPlansPage(
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -86,10 +86,10 @@ public Page getPlansPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Plan")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/plans")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/plans")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Plan postPlan(Plan plan) throws Exception {
return new Plan();
@@ -111,14 +111,14 @@ public Plan postPlan(Plan plan) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Plan")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/plans/{internalClassNameKey}/template")
- @javax.ws.rs.Produces("application/octet-stream")
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/plans/{internalClassNameKey}/template")
+ @jakarta.ws.rs.Produces("application/octet-stream")
@Override
public Response getPlanTemplate(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("internalClassNameKey")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("internalClassNameKey")
String internalClassNameKey)
throws Exception {
@@ -143,14 +143,14 @@ public Response getPlanTemplate(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Plan")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/plans/{planId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/plans/{planId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deletePlan(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("planId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("planId")
Long planId)
throws Exception {
}
@@ -171,14 +171,14 @@ public void deletePlan(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Plan")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/plans/{planId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/plans/{planId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Plan getPlan(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("planId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("planId")
Long planId)
throws Exception {
@@ -201,15 +201,15 @@ public Plan getPlan(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Plan")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/plans/{planId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/plans/{planId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Plan patchPlan(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("planId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("planId")
Long planId,
Plan plan)
throws Exception {
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseSiteScopeResourceImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseSiteScopeResourceImpl.java
index b8a4f592db6741..54e5254db9dbde 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseSiteScopeResourceImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseSiteScopeResourceImpl.java
@@ -23,24 +23,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Matija Petanjek
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseSiteScopeResourceImpl implements SiteScopeResource {
/**
@@ -63,17 +63,17 @@ public abstract class BaseSiteScopeResourceImpl implements SiteScopeResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "SiteScope")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/plans/{internalClassNameKey}/site-scopes")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/plans/{internalClassNameKey}/site-scopes")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getPlanInternalClassNameKeySiteScopesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("internalClassNameKey")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("internalClassNameKey")
String internalClassNameKey,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("export")
+ @jakarta.ws.rs.QueryParam("export")
Boolean export)
throws Exception {
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseStrategyResourceImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseStrategyResourceImpl.java
index c550a5c5a8e806..242c36c7c21f14 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseStrategyResourceImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/BaseStrategyResourceImpl.java
@@ -23,24 +23,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Matija Petanjek
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseStrategyResourceImpl implements StrategyResource {
/**
@@ -59,14 +59,14 @@ public abstract class BaseStrategyResourceImpl implements StrategyResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Strategy")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/plans/{internalClassNameKey}/strategies")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/plans/{internalClassNameKey}/strategies")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getPlanInternalClassNameKeyStrategiesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("internalClassNameKey")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("internalClassNameKey")
String internalClassNameKey)
throws Exception {
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/OpenAPIResourceImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
index 99bf236c346691..ffbf8b28fdf7c5 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
@@ -11,23 +11,23 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.info.License;
-import java.lang.reflect.Method;
+import jakarta.annotation.Generated;
-import java.util.HashSet;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.annotation.Generated;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.HashSet;
+import java.util.Set;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/PlanResourceImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/PlanResourceImpl.java
index f8f361d9681891..fa7ffe3f8e02f7 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/PlanResourceImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/PlanResourceImpl.java
@@ -27,11 +27,11 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.ws.rs.core.Response;
+
import java.util.Iterator;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ServiceScope;
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/FieldResourceFactoryImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/FieldResourceFactoryImpl.java
index eb91e5e8f1a0d9..9745788eb8393e 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/FieldResourceFactoryImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/FieldResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/PlanResourceFactoryImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/PlanResourceFactoryImpl.java
index cdb929c12b60c3..33c82113f717fc 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/PlanResourceFactoryImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/PlanResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/SiteScopeResourceFactoryImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/SiteScopeResourceFactoryImpl.java
index 5442d94c818390..5d93e8556cba50 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/SiteScopeResourceFactoryImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/SiteScopeResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/StrategyResourceFactoryImpl.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/StrategyResourceFactoryImpl.java
index ad67d65b3f97f1..a123b82470205d 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/StrategyResourceFactoryImpl.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/resource/v1_0/factory/StrategyResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/vulcan/batch/engine/util/FieldProviderUtil.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/vulcan/batch/engine/util/FieldProviderUtil.java
index a2a8cbca47bac0..f106a2bf7bb77d 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/vulcan/batch/engine/util/FieldProviderUtil.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/vulcan/batch/engine/util/FieldProviderUtil.java
@@ -19,12 +19,12 @@
import com.liferay.portal.vulcan.util.OpenAPIUtil;
import com.liferay.portal.vulcan.yaml.openapi.OpenAPIYAML;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Matija Petanjek
*/
diff --git a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/vulcan/yaml/openapi/OpenAPIYAMLProvider.java b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/vulcan/yaml/openapi/OpenAPIYAMLProvider.java
index 63ff4186510235..3edf16ba5a8c13 100644
--- a/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/vulcan/yaml/openapi/OpenAPIYAMLProvider.java
+++ b/modules/apps/batch-planner/batch-planner-rest-impl/src/main/java/com/liferay/batch/planner/rest/internal/vulcan/yaml/openapi/OpenAPIYAMLProvider.java
@@ -11,10 +11,10 @@
import com.liferay.portal.vulcan.yaml.YAMLUtil;
import com.liferay.portal.vulcan.yaml.openapi.OpenAPIYAML;
-import java.util.Collections;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.core.Response;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.core.Response;
+import java.util.Collections;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/batch-planner/batch-planner-rest-test/build.gradle b/modules/apps/batch-planner/batch-planner-rest-test/build.gradle
index a25258d31a1966..c6100186971229 100644
--- a/modules/apps/batch-planner/batch-planner-rest-test/build.gradle
+++ b/modules/apps/batch-planner/batch-planner-rest-test/build.gradle
@@ -2,8 +2,8 @@ dependencies {
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
- testIntegrationImplementation group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
+ testIntegrationImplementation group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ testIntegrationImplementation group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
testIntegrationImplementation project(":apps:batch-planner:batch-planner-api")
testIntegrationImplementation project(":apps:batch-planner:batch-planner-rest-api")
testIntegrationImplementation project(":apps:batch-planner:batch-planner-rest-client")
diff --git a/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseFieldResourceTestCase.java b/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseFieldResourceTestCase.java
index f9d865df091d7c..3e024747565915 100644
--- a/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseFieldResourceTestCase.java
+++ b/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseFieldResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BasePlanResourceTestCase.java b/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BasePlanResourceTestCase.java
index 246cc0aa3235cf..45cc1bc2cfb69a 100644
--- a/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BasePlanResourceTestCase.java
+++ b/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BasePlanResourceTestCase.java
@@ -54,6 +54,16 @@
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegateBuilderRegistry;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Method;
import java.net.URI;
@@ -72,16 +82,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseSiteScopeResourceTestCase.java b/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseSiteScopeResourceTestCase.java
index 8edc3f2488284b..b8e16f00da1889 100644
--- a/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseSiteScopeResourceTestCase.java
+++ b/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseSiteScopeResourceTestCase.java
@@ -41,6 +41,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -56,10 +60,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseStrategyResourceTestCase.java b/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseStrategyResourceTestCase.java
index dd284c093656a5..333f601d72fe60 100644
--- a/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseStrategyResourceTestCase.java
+++ b/modules/apps/batch-planner/batch-planner-rest-test/src/testIntegration/java/com/liferay/batch/planner/rest/resource/v1_0/test/BaseStrategyResourceTestCase.java
@@ -41,6 +41,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -56,10 +60,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/batch-planner/batch-planner-service/build.gradle b/modules/apps/batch-planner/batch-planner-service/build.gradle
index 27dc5d3217daad..35214e83e2076c 100644
--- a/modules/apps/batch-planner/batch-planner-service/build.gradle
+++ b/modules/apps/batch-planner/batch-planner-service/build.gradle
@@ -4,10 +4,10 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:batch-engine:batch-engine-api")
diff --git a/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/batch/engine/broker/BatchEngineBrokerImpl.java b/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/batch/engine/broker/BatchEngineBrokerImpl.java
index fba71de3e07b57..5f24d9b9480c3b 100644
--- a/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/batch/engine/broker/BatchEngineBrokerImpl.java
+++ b/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/batch/engine/broker/BatchEngineBrokerImpl.java
@@ -29,6 +29,8 @@
import com.liferay.portal.vulcan.multipart.BinaryFile;
import com.liferay.portal.vulcan.multipart.MultipartBody;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.File;
import java.io.FileInputStream;
@@ -39,8 +41,6 @@
import java.util.List;
import java.util.Map;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/notifications/BatchPlannerUserNotificationDefinition.java b/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/notifications/BatchPlannerUserNotificationDefinition.java
index 83c4878f23af5c..bf474d5f2ceb9d 100644
--- a/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/notifications/BatchPlannerUserNotificationDefinition.java
+++ b/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/notifications/BatchPlannerUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Igor Beslic
*/
@Component(
- property = "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ property = "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
service = UserNotificationDefinition.class
)
public class BatchPlannerUserNotificationDefinition
diff --git a/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/notifications/BatchPlannerUserNotificationHandler.java b/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/notifications/BatchPlannerUserNotificationHandler.java
index 8afaf96c10862a..545e484f222ff1 100644
--- a/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/notifications/BatchPlannerUserNotificationHandler.java
+++ b/modules/apps/batch-planner/batch-planner-service/src/main/java/com/liferay/batch/planner/internal/notifications/BatchPlannerUserNotificationHandler.java
@@ -20,7 +20,7 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.TextFormatter;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
* @author Igor Beslic
*/
@Component(
- property = "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ property = "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
service = UserNotificationHandler.class
)
public class BatchPlannerUserNotificationHandler
diff --git a/modules/apps/batch-planner/batch-planner-test/build.gradle b/modules/apps/batch-planner/batch-planner-test/build.gradle
index 3d03fde62493d1..7b9ec19f558ca6 100644
--- a/modules/apps/batch-planner/batch-planner-test/build.gradle
+++ b/modules/apps/batch-planner/batch-planner-test/build.gradle
@@ -2,7 +2,7 @@ dependencies {
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
- testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
+ testIntegrationImplementation group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
testIntegrationImplementation group: "org.apache.commons", name: "commons-csv", version: "1.9.0"
testIntegrationImplementation project(":apps:batch-engine:batch-engine-api")
testIntegrationImplementation project(":apps:batch-planner:batch-planner-api")
diff --git a/modules/apps/batch-planner/batch-planner-web/build.gradle b/modules/apps/batch-planner/batch-planner-web/build.gradle
index c228ae68f69112..e6105225fb12c8 100644
--- a/modules/apps/batch-planner/batch-planner-web/build.gradle
+++ b/modules/apps/batch-planner/batch-planner-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "jstl", name: "jstl", version: "1.2"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp.jstl", name: "jakarta.servlet.jsp.jstl-api", version: "3.0.2"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.jaxrs", version: "1.0.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/application/list/BatchPlannerPanelApp.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/application/list/BatchPlannerPanelApp.java
index 7323b8403c0090..6b7c5d3b35a3b8 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/application/list/BatchPlannerPanelApp.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/application/list/BatchPlannerPanelApp.java
@@ -52,7 +52,7 @@ public boolean isShow(PermissionChecker permissionChecker, Group group)
}
@Reference(
- target = "(javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER + ")"
+ target = "(jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BaseDisplayContext.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BaseDisplayContext.java
index 572cdb02c9283b..efb0c49738bd2d 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BaseDisplayContext.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BaseDisplayContext.java
@@ -12,13 +12,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PortalUtil;
-import java.util.List;
-import java.util.Objects;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Objects;
/**
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BaseSearchContainerManagementToolbarDisplayContext.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BaseSearchContainerManagementToolbarDisplayContext.java
index 2f970f7ff57c51..9f9cf9c0230b4a 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BaseSearchContainerManagementToolbarDisplayContext.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BaseSearchContainerManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanDisplayContext.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanDisplayContext.java
index fc84e6c4bdab6b..b49b37d21b0467 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanDisplayContext.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanDisplayContext.java
@@ -27,11 +27,11 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Objects;
/**
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanManagementToolbarDisplayContext.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanManagementToolbarDisplayContext.java
index 0bf4a2fd1341ef..dd05b4d7bfd003 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanManagementToolbarDisplayContext.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanManagementToolbarDisplayContext.java
@@ -17,11 +17,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PortalUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Matija Petanjek
*/
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanTemplateDisplayContext.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanTemplateDisplayContext.java
index 3959c19096cfb4..020617421db955 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanTemplateDisplayContext.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanTemplateDisplayContext.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Objects;
/**
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanTemplateManagementToolbarDisplayContext.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanTemplateManagementToolbarDisplayContext.java
index a12b0f9f48c0c6..f1461906640f77 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanTemplateManagementToolbarDisplayContext.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/BatchPlannerPlanTemplateManagementToolbarDisplayContext.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Matija Petanjek
*/
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/EditBatchPlannerPlanDisplayContext.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/EditBatchPlannerPlanDisplayContext.java
index ee996f5ca3296b..336616a4c9ccc1 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/EditBatchPlannerPlanDisplayContext.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/display/context/EditBatchPlannerPlanDisplayContext.java
@@ -20,6 +20,10 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
@@ -27,10 +31,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.portlet.RenderRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Igor Beslic
* @author Matija Petanjek
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/helper/BatchPlannerPlanHelper.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/helper/BatchPlannerPlanHelper.java
index 24230543ed2cfc..311c43f0b44462 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/helper/BatchPlannerPlanHelper.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/helper/BatchPlannerPlanHelper.java
@@ -26,6 +26,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.io.File;
import java.net.URI;
@@ -37,8 +39,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/BatchPlannerPortlet.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/BatchPlannerPortlet.java
index fb6461e72f41e0..4d1753787ea13e 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/BatchPlannerPortlet.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/BatchPlannerPortlet.java
@@ -10,12 +10,12 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
@@ -32,13 +32,13 @@
"com.liferay.portlet.private-request-attributes=false",
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
- "javax.portlet.display-name=Batch Planner",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Batch Planner",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/DeleteBatchPlannerPlanTemplateMVCActionCommand.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/DeleteBatchPlannerPlanTemplateMVCActionCommand.java
index 013471d7af1713..721b08e20aa177 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/DeleteBatchPlannerPlanTemplateMVCActionCommand.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/DeleteBatchPlannerPlanTemplateMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
"mvc.command.name=/batch_planner/delete_batch_planner_plan_template"
},
service = MVCActionCommand.class
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditBatchPlannerPlanMVCRenderCommand.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditBatchPlannerPlanMVCRenderCommand.java
index f4dcfd4ca036fd..30a065e54662a1 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditBatchPlannerPlanMVCRenderCommand.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditBatchPlannerPlanMVCRenderCommand.java
@@ -26,14 +26,14 @@
import com.liferay.portal.vulcan.batch.engine.VulcanBatchEngineTaskItemDelegate;
import com.liferay.portal.vulcan.batch.engine.VulcanBatchEngineTaskItemDelegateRegistry;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.FrameworkUtil;
@@ -45,7 +45,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
"mvc.command.name=/batch_planner/edit_export_batch_planner_plan",
"mvc.command.name=/batch_planner/edit_import_batch_planner_plan"
},
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditExportBatchPlannerPlanTemplateMVCActionCommand.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditExportBatchPlannerPlanTemplateMVCActionCommand.java
index e0c0bb2f9888ab..f8eab118f10a3d 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditExportBatchPlannerPlanTemplateMVCActionCommand.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditExportBatchPlannerPlanTemplateMVCActionCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
"mvc.command.name=/batch_planner/edit_export_batch_planner_plan_template"
},
service = MVCActionCommand.class
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditImportBatchPlannerPlanTemplateMVCActionCommand.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditImportBatchPlannerPlanTemplateMVCActionCommand.java
index 6db509af66f197..9e494d06c699e4 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditImportBatchPlannerPlanTemplateMVCActionCommand.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/EditImportBatchPlannerPlanTemplateMVCActionCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
"mvc.command.name=/batch_planner/edit_import_batch_planner_plan_template"
},
service = MVCActionCommand.class
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/SubmitBatchPlannerPlanMVCResourceCommand.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/SubmitBatchPlannerPlanMVCResourceCommand.java
index 047244d7a2105c..720e94f53c9dd5 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/SubmitBatchPlannerPlanMVCResourceCommand.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/SubmitBatchPlannerPlanMVCResourceCommand.java
@@ -19,6 +19,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -27,9 +30,6 @@
import java.nio.file.Files;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
"mvc.command.name=/batch_planner/submit_batch_planner_plan"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/ViewBatchPlannerPlanMVCRenderCommand.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/ViewBatchPlannerPlanMVCRenderCommand.java
index 71ef068bd9feab..f7dce32ac27f2c 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/ViewBatchPlannerPlanMVCRenderCommand.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/ViewBatchPlannerPlanMVCRenderCommand.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
"mvc.command.name=/batch_planner/view_batch_planner_plan"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/ViewBatchPlannerPlanTemplatesMVCRenderCommand.java b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/ViewBatchPlannerPlanTemplatesMVCRenderCommand.java
index 9659d3fb9c5533..6cca930333f03d 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/ViewBatchPlannerPlanTemplatesMVCRenderCommand.java
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/java/com/liferay/batch/planner/web/internal/portlet/action/ViewBatchPlannerPlanTemplatesMVCRenderCommand.java
@@ -10,9 +10,9 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -21,7 +21,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
+ "jakarta.portlet.name=" + BatchPlannerPortletKeys.BATCH_PLANNER,
"mvc.command.name=/batch_planner/view_batch_planner_plan_templates"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/batch-planner/batch-planner-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/batch-planner/batch-planner-web/src/main/resources/META-INF/resources/init.jsp
index a00d083690a123..3dcadd3cd20ff6 100644
--- a/modules/apps/batch-planner/batch-planner-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/batch-planner/batch-planner-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/build.gradle b/modules/apps/bean-portlet/bean-portlet-cdi-extension/build.gradle
index 0bb56df5c4b59b..55d65bd75f3466 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/build.gradle
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/build.gradle
@@ -1,15 +1,16 @@
dependencies {
- compileOnly group: "com.liferay", name: "jakarta.enterprise.cdi", version: "2.0.2.LIFERAY-PATCHED-1"
- compileOnly group: "com.liferay", name: "jakarta.inject", version: "1.0.5.LIFERAY-PATCHED-1"
- compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "2.1.6.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.osgi.service.http.whiteboard", version: "1.1.1.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.interceptor", name: "javax.interceptor-api", version: "1.2"
- compileOnly group: "javax.mvc", name: "javax.mvc-api", version: "1.0.0"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
- compileOnly group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.1.1"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.enterprise", name: "jakarta.enterprise.cdi-api", version: "4.1.0"
+ compileOnly group: "jakarta.enterprise", name: "jakarta.enterprise.cdi-el-api", version: "4.1.0"
+ compileOnly group: "jakarta.inject", name: "jakarta.inject-api", version: "2.0.1"
+ compileOnly group: "jakarta.interceptor", name: "jakarta.interceptor-api", version: "2.2.0"
+ compileOnly group: "jakarta.mvc", name: "jakarta.mvc-api", version: "2.1.0"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:bean-portlet:bean-portlet-api")
compileOnly project(":apps:bean-portlet:bean-portlet-extension-api")
@@ -22,7 +23,7 @@ dependencies {
deployDependencies {
from configurations.compileOnly
- include "javax.mvc-api-*.jar"
+ include "jakarta.mvc-api-*.jar"
- rename(/javax\.mvc-api-(.+)\.jar/, "javax.mvc-api" + renameSuffix)
+ rename(/jakarta\.mvc-api-(.+)\.jar/, "jakarta.mvc-api" + renameSuffix)
}
\ No newline at end of file
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanFilterMethod.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanFilterMethod.java
index b57267beed0adc..0398b7899a8c9c 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanFilterMethod.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanFilterMethod.java
@@ -7,11 +7,11 @@
import com.liferay.bean.portlet.extension.BeanFilterMethod;
-import java.lang.reflect.Method;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import java.lang.reflect.Method;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanFilterMethodFactory.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanFilterMethodFactory.java
index bb0741c06b1d0f..97eb23ddbe41c9 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanFilterMethodFactory.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanFilterMethodFactory.java
@@ -8,9 +8,9 @@
import com.liferay.bean.portlet.extension.BeanFilterMethod;
import com.liferay.bean.portlet.extension.BeanFilterMethodFactory;
-import java.lang.reflect.Method;
+import jakarta.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeanManager;
+import java.lang.reflect.Method;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletExtension.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletExtension.java
index 07d23d6d39040d..7a65c8efbf689e 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletExtension.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletExtension.java
@@ -32,6 +32,51 @@
import com.liferay.portal.kernel.util.LocaleUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ConversationScoped;
+import jakarta.enterprise.context.Destroyed;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+
+import jakarta.portlet.ActionParameters;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletAsyncListener;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletRequestDispatcher;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.annotations.ContextPath;
+import jakarta.portlet.annotations.Namespace;
+import jakarta.portlet.annotations.PortletName;
+import jakarta.portlet.annotations.PortletRequestScoped;
+import jakarta.portlet.annotations.PortletSerializable;
+import jakarta.portlet.annotations.PortletSessionScoped;
+import jakarta.portlet.annotations.RenderStateScoped;
+import jakarta.portlet.annotations.WindowId;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+
import java.io.PrintWriter;
import java.lang.annotation.Annotation;
@@ -47,51 +92,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.context.Destroyed;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import javax.portlet.ActionParameters;
-import javax.portlet.ActionRequest;
-import javax.portlet.MimeResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletAsyncListener;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.annotations.ContextPath;
-import javax.portlet.annotations.Namespace;
-import javax.portlet.annotations.PortletName;
-import javax.portlet.annotations.PortletRequestScoped;
-import javax.portlet.annotations.PortletSerializable;
-import javax.portlet.annotations.PortletSessionScoped;
-import javax.portlet.annotations.RenderStateScoped;
-import javax.portlet.annotations.WindowId;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -392,13 +392,13 @@ private void _invokePortletBeanMethods(
boolean importsMvcPackage = false;
- if (importPackageHeader.contains("javax.mvc;")) {
+ if (importPackageHeader.contains("jakarta.mvc;")) {
importsMvcPackage = true;
}
boolean importsMvcBindingPackage = false;
- if (importPackageHeader.contains("javax.mvc.binding;")) {
+ if (importPackageHeader.contains("jakarta.mvc.binding;")) {
importsMvcBindingPackage = true;
}
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletMethod.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletMethod.java
index e38cf7296d830d..592d1865d32687 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletMethod.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletMethod.java
@@ -8,11 +8,11 @@
import com.liferay.bean.portlet.extension.BaseBeanPortletMethod;
import com.liferay.bean.portlet.extension.BeanPortletMethodType;
-import java.lang.reflect.Method;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import java.lang.reflect.Method;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletMethodFactory.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletMethodFactory.java
index f1759c4e69fb1d..b2b4fdfd6906c0 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletMethodFactory.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/CDIBeanPortletMethodFactory.java
@@ -9,9 +9,9 @@
import com.liferay.bean.portlet.extension.BeanPortletMethodFactory;
import com.liferay.bean.portlet.extension.BeanPortletMethodType;
-import java.lang.reflect.Method;
+import jakarta.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeanManager;
+import java.lang.reflect.Method;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/PortletAsyncScopeManagerImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/PortletAsyncScopeManagerImpl.java
index afca7646d21371..1ba890fa2e6f0f 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/PortletAsyncScopeManagerImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/PortletAsyncScopeManagerImpl.java
@@ -11,13 +11,13 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.portlet.async.PortletAsyncScopeManager;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.io.Closeable;
import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/annotated/type/ModifiedAnnotatedType.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/annotated/type/ModifiedAnnotatedType.java
index ff9bb041c56322..358cf54f4f4800 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/annotated/type/ModifiedAnnotatedType.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/annotated/type/ModifiedAnnotatedType.java
@@ -5,16 +5,16 @@
package com.liferay.bean.portlet.cdi.extension.internal.annotated.type;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-
/**
* @author Shuyang Zhou
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/AfterControllerEventImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/AfterControllerEventImpl.java
index fdb1f515974a27..f56b96c2a2c73d 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/AfterControllerEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/AfterControllerEventImpl.java
@@ -5,10 +5,10 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.event.AfterControllerEvent;
+import jakarta.mvc.event.AfterControllerEvent;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.UriInfo;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/AfterProcessViewEventImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/AfterProcessViewEventImpl.java
index 6c47adcd2c0ba0..62dabc1986aaf4 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/AfterProcessViewEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/AfterProcessViewEventImpl.java
@@ -5,8 +5,8 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.engine.ViewEngine;
-import javax.mvc.event.AfterProcessViewEvent;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.event.AfterProcessViewEvent;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseControllerEventImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseControllerEventImpl.java
index 665dccd413d620..0af72e127e36c7 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseControllerEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseControllerEventImpl.java
@@ -5,8 +5,8 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.UriInfo;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseDescendingPriorityComparator.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseDescendingPriorityComparator.java
index 21d17e990e556f..d95881c533ff9a 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseDescendingPriorityComparator.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseDescendingPriorityComparator.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import java.util.Comparator;
+import jakarta.annotation.Priority;
-import javax.annotation.Priority;
+import java.util.Comparator;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseProcessViewEventImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseProcessViewEventImpl.java
index 66813ebfaa0dd0..37adbde3fa2b2b 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseProcessViewEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BaseProcessViewEventImpl.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.engine.ViewEngine;
+import jakarta.mvc.engine.ViewEngine;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanUtil.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanUtil.java
index 7228f7e591e3ee..b1f159981b5bd2 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanUtil.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanUtil.java
@@ -8,6 +8,11 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+
+import jakarta.mvc.binding.BindingResult;
+
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
@@ -19,11 +24,6 @@
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-
-import javax.mvc.binding.BindingResult;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationInterceptor.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationInterceptor.java
index 4be572f08d083b..753f4c17462d7c 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationInterceptor.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationInterceptor.java
@@ -5,6 +5,29 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.annotation.Priority;
+
+import jakarta.enterprise.inject.spi.BeanManager;
+
+import jakarta.inject.Inject;
+
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
+
+import jakarta.mvc.MvcContext;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ElementKind;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Path;
+import jakarta.validation.Validator;
+
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.QueryParam;
+
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
@@ -17,29 +40,6 @@
import java.util.Set;
-import javax.annotation.Priority;
-
-import javax.enterprise.inject.spi.BeanManager;
-
-import javax.inject.Inject;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-
-import javax.mvc.MvcContext;
-
-import javax.validation.ConstraintViolation;
-import javax.validation.ElementKind;
-import javax.validation.MessageInterpolator;
-import javax.validation.Path;
-import javax.validation.Validator;
-
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.QueryParam;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationInterceptorBinding.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationInterceptorBinding.java
index 22e8ce7df7d983..6677b93adbea5e 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationInterceptorBinding.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationInterceptorBinding.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.interceptor.InterceptorBinding;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBinding;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationMessageInterpolator.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationMessageInterpolator.java
index b8954c21a269ac..f89d211485de8f 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationMessageInterpolator.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationMessageInterpolator.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationProducer.java
index 197e1f84d48cd9..062db5a9bfe3bb 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationProducer.java
@@ -8,22 +8,22 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import java.util.Iterator;
+import jakarta.annotation.PostConstruct;
-import javax.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
+import jakarta.inject.Inject;
-import javax.inject.Inject;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.NoProviderFoundException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.NoProviderFoundException;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import java.util.Iterator;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationValidator.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationValidator.java
index b81b3dc8280ebe..87eceaa11c9e73 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationValidator.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeanValidationValidator.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeforeControllerEventImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeforeControllerEventImpl.java
index 38f86f41e0b247..684144adcb3dbb 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeforeControllerEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeforeControllerEventImpl.java
@@ -5,10 +5,10 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.event.BeforeControllerEvent;
+import jakarta.mvc.event.BeforeControllerEvent;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.UriInfo;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeforeProcessViewEventImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeforeProcessViewEventImpl.java
index 5bfd1ec6bfc59f..9b10b8ea35697d 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeforeProcessViewEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BeforeProcessViewEventImpl.java
@@ -5,8 +5,8 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.engine.ViewEngine;
-import javax.mvc.event.BeforeProcessViewEvent;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.event.BeforeProcessViewEvent;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingErrorImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingErrorImpl.java
index 48480b0a6c0461..283ef70ea347bd 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingErrorImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingErrorImpl.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.binding.BindingError;
+import jakarta.mvc.binding.BindingError;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingResultImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingResultImpl.java
index d131703b57e233..638cc52663ab9e 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingResultImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingResultImpl.java
@@ -5,6 +5,10 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.mvc.binding.BindingError;
+import jakarta.mvc.binding.ParamError;
+import jakarta.mvc.binding.ValidationError;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -13,10 +17,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.mvc.binding.BindingError;
-import javax.mvc.binding.ParamError;
-import javax.mvc.binding.ValidationError;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingResultProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingResultProducer.java
index 47a452c9b20990..a35c4d7fff8ebd 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingResultProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/BindingResultProducer.java
@@ -5,11 +5,11 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
-import javax.mvc.RedirectScoped;
-import javax.mvc.binding.BindingResult;
+import jakarta.mvc.RedirectScoped;
+import jakarta.mvc.binding.BindingResult;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ConfigurationImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ConfigurationImpl.java
index c09382bb3392f6..e69f0d882932a9 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ConfigurationImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ConfigurationImpl.java
@@ -5,19 +5,19 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletContext;
+
+import jakarta.ws.rs.RuntimeType;
+import jakarta.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Feature;
+
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-
-import javax.ws.rs.RuntimeType;
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.Feature;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ConfigurationProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ConfigurationProducer.java
index d1f1cfd8a2ca92..1c1aacd3b0e4a7 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ConfigurationProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ConfigurationProducer.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletContext;
-import javax.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Configuration;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerInterceptor.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerInterceptor.java
index a1b86479148d40..21c0f7d0d604f6 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerInterceptor.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerInterceptor.java
@@ -12,6 +12,38 @@
import com.liferay.portal.kernel.servlet.HttpHeaders;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.annotation.Priority;
+
+import jakarta.enterprise.event.Event;
+
+import jakarta.inject.Inject;
+
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
+
+import jakarta.mvc.View;
+import jakarta.mvc.event.MvcEvent;
+
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.BaseURL;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.MutableResourceParameters;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.annotations.ActionMethod;
+import jakarta.portlet.annotations.DestroyMethod;
+import jakarta.portlet.annotations.EventMethod;
+import jakarta.portlet.annotations.InitMethod;
+import jakarta.portlet.annotations.RenderMethod;
+import jakarta.portlet.filter.RenderURLWrapper;
+import jakarta.portlet.filter.ResourceURLWrapper;
+
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.Serializable;
@@ -20,38 +52,6 @@
import java.net.URI;
import java.net.URISyntaxException;
-import javax.annotation.Priority;
-
-import javax.enterprise.event.Event;
-
-import javax.inject.Inject;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-
-import javax.mvc.View;
-import javax.mvc.event.MvcEvent;
-
-import javax.portlet.ActionResponse;
-import javax.portlet.BaseURL;
-import javax.portlet.MimeResponse;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.MutableResourceParameters;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.ResourceResponse;
-import javax.portlet.annotations.ActionMethod;
-import javax.portlet.annotations.DestroyMethod;
-import javax.portlet.annotations.EventMethod;
-import javax.portlet.annotations.InitMethod;
-import javax.portlet.annotations.RenderMethod;
-import javax.portlet.filter.RenderURLWrapper;
-import javax.portlet.filter.ResourceURLWrapper;
-
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerInterceptorBinding.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerInterceptorBinding.java
index 31a3cef2dceef7..c599066e4ee141 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerInterceptorBinding.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerInterceptorBinding.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.interceptor.InterceptorBinding;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBinding;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerRedirectEventImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerRedirectEventImpl.java
index 1be4e0956e530d..a4693d015dc489 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerRedirectEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ControllerRedirectEventImpl.java
@@ -5,12 +5,12 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import java.net.URI;
+import jakarta.mvc.event.ControllerRedirectEvent;
-import javax.mvc.event.ControllerRedirectEvent;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.UriInfo;
+import java.net.URI;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfImpl.java
index 6edb2e8b0d28da..860d808c8501b0 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfImpl.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.security.Csrf;
+import jakarta.mvc.security.Csrf;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfValidationInterceptor.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfValidationInterceptor.java
index 260437ffac74e6..970878cb46464a 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfValidationInterceptor.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfValidationInterceptor.java
@@ -13,24 +13,24 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.Serializable;
+import jakarta.annotation.Priority;
-import java.lang.reflect.Method;
+import jakarta.inject.Inject;
-import javax.annotation.Priority;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
-import javax.inject.Inject;
+import jakarta.mvc.security.Csrf;
+import jakarta.mvc.security.CsrfProtected;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.portlet.ClientDataRequest;
-import javax.mvc.security.Csrf;
-import javax.mvc.security.CsrfProtected;
+import jakarta.ws.rs.core.Configuration;
-import javax.portlet.ClientDataRequest;
+import java.io.Serializable;
-import javax.ws.rs.core.Configuration;
+import java.lang.reflect.Method;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfValidationInterceptorBinding.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfValidationInterceptorBinding.java
index 1b4f1769ea21d3..f0e7a84737e529 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfValidationInterceptorBinding.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/CsrfValidationInterceptorBinding.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.interceptor.InterceptorBinding;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBinding;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/EncodersImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/EncodersImpl.java
index 3aa969395411ab..ded5ad059d9184 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/EncodersImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/EncodersImpl.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.util.HtmlUtil;
-import javax.mvc.security.Encoders;
+import jakarta.mvc.security.Encoders;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/EncodersProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/EncodersProducer.java
index a689333ffdfb87..59aeb685b5d1ee 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/EncodersProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/EncodersProducer.java
@@ -5,10 +5,10 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
-import javax.mvc.security.Encoders;
+import jakarta.mvc.security.Encoders;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/LocaleResolverContextImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/LocaleResolverContextImpl.java
index da3a1b45919fe7..26ac9ccee60bb3 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/LocaleResolverContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/LocaleResolverContextImpl.java
@@ -5,17 +5,17 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.mvc.locale.LocaleResolverContext;
+
+import jakarta.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.mvc.locale.LocaleResolverContext;
-
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/LocaleResolverImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/LocaleResolverImpl.java
index c72f0504a40294..d6bc5d028a9adc 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/LocaleResolverImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/LocaleResolverImpl.java
@@ -7,16 +7,16 @@
import com.liferay.portal.kernel.util.LocaleUtil;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
+import jakarta.annotation.Priority;
-import javax.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.mvc.locale.LocaleResolver;
+import jakarta.mvc.locale.LocaleResolverContext;
-import javax.mvc.locale.LocaleResolver;
-import javax.mvc.locale.LocaleResolverContext;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCContextImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCContextImpl.java
index 445b8baa479058..2549478e1d4f55 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCContextImpl.java
@@ -11,6 +11,20 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.mvc.MvcContext;
+import jakarta.mvc.locale.LocaleResolver;
+import jakarta.mvc.locale.LocaleResolverContext;
+import jakarta.mvc.security.Csrf;
+import jakarta.mvc.security.Encoders;
+
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.Cookie;
+
+import jakarta.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.UriBuilder;
+
import java.net.URI;
import java.util.Collections;
@@ -20,20 +34,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.mvc.MvcContext;
-import javax.mvc.locale.LocaleResolver;
-import javax.mvc.locale.LocaleResolverContext;
-import javax.mvc.security.Csrf;
-import javax.mvc.security.Encoders;
-
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.Cookie;
-
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.UriBuilder;
-
/**
* @author Neil Griffin
*/
@@ -63,7 +63,7 @@ public MVCContextImpl(
_csrf = new CsrfImpl(
"p_auth", csrfLiferayPortletURL.getParameter("p_auth"));
- Map cookieMap = new HashMap<>();
+ Map cookieMap = new HashMap<>();
Cookie[] cookies = portletRequest.getCookies();
@@ -71,7 +71,7 @@ public MVCContextImpl(
for (Cookie cookie : cookies) {
cookieMap.put(
cookie.getName(),
- new javax.ws.rs.core.Cookie(
+ new jakarta.ws.rs.core.Cookie(
cookie.getName(), cookie.getValue()));
}
}
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCContextProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCContextProducer.java
index 1812b923583713..0c8ea387e342e8 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCContextProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCContextProducer.java
@@ -5,27 +5,27 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import java.util.Collections;
-import java.util.List;
+import jakarta.annotation.PostConstruct;
-import javax.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.BeanManager;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.mvc.MvcContext;
+import jakarta.mvc.locale.LocaleResolver;
+import jakarta.mvc.security.Encoders;
-import javax.mvc.MvcContext;
-import javax.mvc.locale.LocaleResolver;
-import javax.mvc.security.Encoders;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.annotations.PortletRequestScoped;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.annotations.PortletRequestScoped;
+import jakarta.ws.rs.core.Configuration;
-import javax.ws.rs.core.Configuration;
+import java.util.Collections;
+import java.util.List;
/**
* @author Neil Griffin
@@ -66,7 +66,7 @@ private static class LocaleResolverPriorityComparator
private LocaleResolverPriorityComparator() {
- // The Javadoc for javax.mvc.locale.LocaleResolver states "If no
+ // The Javadoc for jakarta.mvc.locale.LocaleResolver states "If no
// priority is explicitly defined, the priority is assumed to be
// 1000."
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCExtension.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCExtension.java
index 84a6b589a09ad3..32ae83f48b904c 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCExtension.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MVCExtension.java
@@ -10,39 +10,39 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+
+import jakarta.inject.Inject;
+
+import jakarta.mvc.Controller;
+import jakarta.mvc.RedirectScoped;
+
+import jakarta.portlet.annotations.ActionMethod;
+import jakarta.portlet.annotations.RenderMethod;
+import jakarta.portlet.annotations.ServeResourceMethod;
+
+import jakarta.validation.executable.ExecutableType;
+import jakarta.validation.executable.ValidateOnExecution;
+
+import jakarta.ws.rs.BeanParam;
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.MatrixParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+
import java.lang.annotation.Annotation;
import java.util.LinkedHashSet;
import java.util.Set;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-
-import javax.inject.Inject;
-
-import javax.mvc.Controller;
-import javax.mvc.RedirectScoped;
-
-import javax.portlet.annotations.ActionMethod;
-import javax.portlet.annotations.RenderMethod;
-import javax.portlet.annotations.ServeResourceMethod;
-
-import javax.validation.executable.ExecutableType;
-import javax.validation.executable.ValidateOnExecution;
-
-import javax.ws.rs.BeanParam;
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.MatrixParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MessageInterpolatorContextImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MessageInterpolatorContextImpl.java
index 7779f073a40d61..5850606723d0ec 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MessageInterpolatorContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MessageInterpolatorContextImpl.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.validation.ConstraintViolation;
-import javax.validation.MessageInterpolator;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.metadata.ConstraintDescriptor;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModelsImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModelsImpl.java
index bd74dc83d545cf..a1df279c0079e4 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModelsImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModelsImpl.java
@@ -5,6 +5,8 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.mvc.Models;
+
import java.io.Serializable;
import java.util.Collections;
@@ -13,8 +15,6 @@
import java.util.Map;
import java.util.Set;
-import javax.mvc.Models;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModelsProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModelsProducer.java
index a8b933f7a1afec..fa717fad3c5080 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModelsProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModelsProducer.java
@@ -5,12 +5,12 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.inject.Named;
-import javax.mvc.Models;
-import javax.mvc.RedirectScoped;
+import jakarta.mvc.Models;
+import jakarta.mvc.RedirectScoped;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedAnnotatedType.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedAnnotatedType.java
index 1c0efef2b6715b..fca70a67716963 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedAnnotatedType.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedAnnotatedType.java
@@ -5,16 +5,16 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedField.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedField.java
index be668c14f03c67..40feeae1ed840a 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedField.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedField.java
@@ -5,15 +5,15 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedType;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedMethod.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedMethod.java
index 4f92a7988b9a8d..8aa8b9bf43df94 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedMethod.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ModifiedMethod.java
@@ -5,6 +5,10 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
@@ -12,10 +16,6 @@
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MutableBindingResult.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MutableBindingResult.java
index 464d4700fbd8cb..e3aafc3d0ee056 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MutableBindingResult.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/MutableBindingResult.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.binding.BindingError;
-import javax.mvc.binding.BindingResult;
-import javax.mvc.binding.ValidationError;
+import jakarta.mvc.binding.BindingError;
+import jakarta.mvc.binding.BindingResult;
+import jakarta.mvc.binding.ValidationError;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProviderImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProviderImpl.java
index b35eb0275938f6..55eabe312df6f8 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProviderImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProviderImpl.java
@@ -9,6 +9,11 @@
import com.liferay.bean.portlet.cdi.extension.internal.scope.ScopedBeanManagerThreadLocal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -17,11 +22,6 @@
import java.util.function.Function;
-import javax.portlet.PortletRequest;
-
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProviders.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProviders.java
index a9afed6828ef7f..cabb8ed7815098 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProviders.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProviders.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProvidersProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProvidersProducer.java
index 04fa406c7f5ef6..39a9bc3e81105e 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProvidersProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamConverterProvidersProducer.java
@@ -5,18 +5,18 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import java.util.Collections;
-import java.util.List;
+import jakarta.annotation.PostConstruct;
-import javax.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.BeanManager;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Inject;
-import javax.inject.Inject;
+import jakarta.ws.rs.ext.ParamConverterProvider;
-import javax.ws.rs.ext.ParamConverterProvider;
+import java.util.Collections;
+import java.util.List;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamErrorImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamErrorImpl.java
index e64b6dfe939922..c2f26afbda731a 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamErrorImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ParamErrorImpl.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.binding.ParamError;
+import jakarta.mvc.binding.ParamError;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/PortletParam.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/PortletParam.java
index f068ae5fdfc98c..84317e805e7322 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/PortletParam.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/PortletParam.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/PortletParamProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/PortletParamProducer.java
index 5c09c4f10b2940..d4a6f2cdccfd56 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/PortletParamProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/PortletParamProducer.java
@@ -12,6 +12,27 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+
+import jakarta.inject.Inject;
+
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -21,27 +42,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import javax.inject.Inject;
-
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/RequestImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/RequestImpl.java
index d42bab407b1629..06e6ffffdb075f 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/RequestImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/RequestImpl.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.ws.rs.core.EntityTag;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Variant;
+
import java.util.Date;
import java.util.List;
-import javax.ws.rs.core.EntityTag;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Variant;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ResourceInfoImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ResourceInfoImpl.java
index 002f06a578c5be..012bcd87ae13c9 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ResourceInfoImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ResourceInfoImpl.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import java.lang.reflect.Method;
+import jakarta.ws.rs.container.ResourceInfo;
-import javax.ws.rs.container.ResourceInfo;
+import java.lang.reflect.Method;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/UriInfoImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/UriInfoImpl.java
index efea5ae50bb1f4..47cb9e53eb8fff 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/UriInfoImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/UriInfoImpl.java
@@ -5,15 +5,15 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.net.URI;
import java.util.List;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ValidationErrorImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ValidationErrorImpl.java
index 2677a67c783433..0ad9afedeeb99e 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ValidationErrorImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ValidationErrorImpl.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.mvc.binding.ValidationError;
+import jakarta.mvc.binding.ValidationError;
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineContextImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineContextImpl.java
index 966b6876682c28..7edc29bb1de62e 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineContextImpl.java
@@ -9,22 +9,22 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import java.io.IOException;
-import java.io.OutputStream;
+import jakarta.mvc.Models;
+import jakarta.mvc.engine.ViewEngineContext;
-import java.util.Locale;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletRequest;
-import javax.mvc.Models;
-import javax.mvc.engine.ViewEngineContext;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletRequest;
+import java.io.IOException;
+import java.io.OutputStream;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
+import java.util.Locale;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineContextProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineContextProducer.java
index f3f06a81e7699e..def0a7b0649870 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineContextProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineContextProducer.java
@@ -5,17 +5,17 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
-import javax.mvc.Models;
-import javax.mvc.engine.ViewEngineContext;
+import jakarta.mvc.Models;
+import jakarta.mvc.engine.ViewEngineContext;
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletRequest;
-import javax.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Configuration;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineJspImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineJspImpl.java
index f536b7eedca177..66b28989c54f4e 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineJspImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngineJspImpl.java
@@ -5,18 +5,18 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
-import javax.mvc.engine.ViewEngine;
-import javax.mvc.engine.ViewEngineContext;
-import javax.mvc.engine.ViewEngineException;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.engine.ViewEngineContext;
+import jakarta.mvc.engine.ViewEngineException;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletRequestDispatcher;
+import jakarta.portlet.PortletResponse;
-import javax.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Configuration;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngines.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngines.java
index 4a985ffa2e837b..092d143712df6e 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngines.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEngines.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
+import jakarta.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEnginesProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEnginesProducer.java
index cc227ef75743a1..9a6784820141eb 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEnginesProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewEnginesProducer.java
@@ -5,18 +5,18 @@
package com.liferay.bean.portlet.cdi.extension.internal.mvc;
-import java.util.Collections;
-import java.util.List;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.BeanManager;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.mvc.engine.ViewEngine;
-import javax.mvc.engine.ViewEngine;
+import jakarta.portlet.PortletContext;
-import javax.portlet.PortletContext;
+import jakarta.ws.rs.core.Configuration;
-import javax.ws.rs.core.Configuration;
+import java.util.Collections;
+import java.util.List;
/**
* @author Neil Griffin
@@ -46,9 +46,9 @@ private static class ViewEnginePriorityComparator
private ViewEnginePriorityComparator() {
- // The Javadoc for javax.mvc.engine.ViewEngine states "View engines
- // can be decorated with javax.annotation.Priority to indicate their
- // priority; otherwise the priority is assumed to be
+ // The Javadoc for jakarta.mvc.engine.ViewEngine states "View
+ // engines can be decorated with jakarta.annotation.Priority to
+ // indicate their priority; otherwise the priority is assumed to be
// ViewEngine.PRIORITY_APPLICATION."
super(ViewEngine.PRIORITY_APPLICATION);
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewRendererMVCImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewRendererMVCImpl.java
index cfd0046593f068..7b4d9d51ea77c1 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewRendererMVCImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/mvc/ViewRendererMVCImpl.java
@@ -10,6 +10,25 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.TypeLiteral;
+
+import jakarta.mvc.Models;
+import jakarta.mvc.binding.ParamError;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.engine.ViewEngineException;
+
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletSession;
+
+import jakarta.ws.rs.core.Configuration;
+
import java.lang.annotation.Annotation;
import java.util.ArrayList;
@@ -17,25 +36,6 @@
import java.util.Map;
import java.util.Set;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.TypeLiteral;
-
-import javax.mvc.Models;
-import javax.mvc.binding.ParamError;
-import javax.mvc.engine.ViewEngine;
-import javax.mvc.engine.ViewEngineException;
-
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-
-import javax.ws.rs.core.Configuration;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/BaseContextImpl.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/BaseContextImpl.java
index 45ec2da442d57a..b10aef3261a4e3 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/BaseContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/BaseContextImpl.java
@@ -5,8 +5,8 @@
package com.liferay.bean.portlet.cdi.extension.internal.scope;
-import javax.enterprise.context.spi.Context;
-import javax.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.Context;
+import jakarta.enterprise.context.spi.Contextual;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/CDIScopedBean.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/CDIScopedBean.java
index eb8d7922ecf11c..ffc67387e9d0af 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/CDIScopedBean.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/CDIScopedBean.java
@@ -10,10 +10,10 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import java.io.Serializable;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
+import java.io.Serializable;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/JSR362CDIBeanProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/JSR362CDIBeanProducer.java
index 861922216419a9..aa68f7b04c30b8 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/JSR362CDIBeanProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/JSR362CDIBeanProducer.java
@@ -9,6 +9,45 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Typed;
+
+import jakarta.inject.Named;
+
+import jakarta.portlet.ActionParameters;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.ClientDataRequest;
+import jakarta.portlet.EventRequest;
+import jakarta.portlet.EventResponse;
+import jakarta.portlet.HeaderRequest;
+import jakarta.portlet.HeaderResponse;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceParameters;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.StateAwareResponse;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.annotations.ContextPath;
+import jakarta.portlet.annotations.Namespace;
+import jakarta.portlet.annotations.PortletName;
+import jakarta.portlet.annotations.PortletRequestScoped;
+import jakarta.portlet.annotations.WindowId;
+
+import jakarta.servlet.http.Cookie;
+
import java.lang.annotation.Annotation;
import java.util.Arrays;
@@ -16,45 +55,6 @@
import java.util.List;
import java.util.Locale;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.Typed;
-
-import javax.inject.Named;
-
-import javax.portlet.ActionParameters;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.ClientDataRequest;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.HeaderRequest;
-import javax.portlet.HeaderResponse;
-import javax.portlet.MimeResponse;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceParameters;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.StateAwareResponse;
-import javax.portlet.WindowState;
-import javax.portlet.annotations.ContextPath;
-import javax.portlet.annotations.Namespace;
-import javax.portlet.annotations.PortletName;
-import javax.portlet.annotations.PortletRequestScoped;
-import javax.portlet.annotations.WindowId;
-
-import javax.servlet.http.Cookie;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/LiferayBeanProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/LiferayBeanProducer.java
index 05451cbf5cf8e1..f6c7bb17bbad0c 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/LiferayBeanProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/LiferayBeanProducer.java
@@ -8,13 +8,13 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
-import javax.portlet.PortletRequest;
-import javax.portlet.annotations.PortletRequestScoped;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.annotations.PortletRequestScoped;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/PortletRequestBeanContext.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/PortletRequestBeanContext.java
index becd089a6e9484..de4a2c8867f6d3 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/PortletRequestBeanContext.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/PortletRequestBeanContext.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.cdi.extension.internal.scope;
-import java.lang.annotation.Annotation;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.portlet.annotations.PortletRequestScoped;
-import javax.portlet.annotations.PortletRequestScoped;
+import java.lang.annotation.Annotation;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/PortletSessionBeanContext.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/PortletSessionBeanContext.java
index b8247237cd0d80..4881055cc7871d 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/PortletSessionBeanContext.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/PortletSessionBeanContext.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.cdi.extension.internal.scope;
-import java.lang.annotation.Annotation;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.annotations.PortletSessionScoped;
-import javax.portlet.PortletSession;
-import javax.portlet.annotations.PortletSessionScoped;
+import java.lang.annotation.Annotation;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/RedirectBeanContext.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/RedirectBeanContext.java
index 130fc6afdbd13f..b66c8e37609cfa 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/RedirectBeanContext.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/RedirectBeanContext.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.cdi.extension.internal.scope;
-import java.lang.annotation.Annotation;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.mvc.RedirectScoped;
-import javax.mvc.RedirectScoped;
+import java.lang.annotation.Annotation;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/RenderStateBeanContext.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/RenderStateBeanContext.java
index 0bf71094b2a4c9..d37ce7693375d3 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/RenderStateBeanContext.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/RenderStateBeanContext.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.cdi.extension.internal.scope;
-import java.lang.annotation.Annotation;
+import jakarta.enterprise.context.spi.Contextual;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
-import javax.enterprise.context.spi.Contextual;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
+import jakarta.portlet.annotations.RenderStateScoped;
-import javax.portlet.annotations.RenderStateScoped;
+import java.lang.annotation.Annotation;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/ScopedBeanManager.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/ScopedBeanManager.java
index 1cffe7c21ce01d..d747a06c68d94a 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/ScopedBeanManager.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/ScopedBeanManager.java
@@ -7,27 +7,27 @@
import com.liferay.bean.portlet.extension.ScopedBean;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+
+import jakarta.mvc.RedirectScoped;
+
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.StateAwareResponse;
+import jakarta.portlet.annotations.PortletRequestScoped;
+import jakarta.portlet.annotations.PortletSerializable;
+import jakarta.portlet.annotations.PortletSessionScoped;
+import jakarta.portlet.annotations.RenderStateScoped;
+
import java.util.Enumeration;
import java.util.Objects;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-
-import javax.mvc.RedirectScoped;
-
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.RenderResponse;
-import javax.portlet.StateAwareResponse;
-import javax.portlet.annotations.PortletRequestScoped;
-import javax.portlet.annotations.PortletSerializable;
-import javax.portlet.annotations.PortletSessionScoped;
-import javax.portlet.annotations.RenderStateScoped;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/ServletContextProducer.java b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/ServletContextProducer.java
index 1c9ffa67bd5178..930da44d6238ec 100644
--- a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/ServletContextProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/java/com/liferay/bean/portlet/cdi/extension/internal/scope/ServletContextProducer.java
@@ -5,17 +5,17 @@
package com.liferay.bean.portlet.cdi.extension.internal.scope;
-import javax.annotation.Priority;
+import jakarta.annotation.Priority;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Alternative;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Initialized;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Alternative;
+import jakarta.enterprise.inject.Produces;
-import javax.interceptor.Interceptor;
+import jakarta.interceptor.Interceptor;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to modules/apps/bean-portlet/bean-portlet-cdi-extension/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/build.gradle b/modules/apps/bean-portlet/bean-portlet-extension-api/build.gradle
index f5a12a8f84b2b0..e41e278f50f577 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/build.gradle
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/build.gradle
@@ -1,6 +1,6 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":core:petra:petra-lang")
compileOnly project(":core:petra:petra-string")
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BaseBeanPortletMethod.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BaseBeanPortletMethod.java
index f6de0b962bc6db..00c92178681dae 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BaseBeanPortletMethod.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BaseBeanPortletMethod.java
@@ -8,20 +8,20 @@
import com.liferay.petra.lang.HashUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.ProcessAction;
+import jakarta.portlet.RenderMode;
+import jakarta.portlet.annotations.ActionMethod;
+import jakarta.portlet.annotations.EventMethod;
+import jakarta.portlet.annotations.HeaderMethod;
+import jakarta.portlet.annotations.PortletQName;
+import jakarta.portlet.annotations.RenderMethod;
+import jakarta.portlet.annotations.ServeResourceMethod;
+
import java.lang.reflect.Method;
import java.util.Objects;
-import javax.portlet.PortletMode;
-import javax.portlet.ProcessAction;
-import javax.portlet.RenderMode;
-import javax.portlet.annotations.ActionMethod;
-import javax.portlet.annotations.EventMethod;
-import javax.portlet.annotations.HeaderMethod;
-import javax.portlet.annotations.PortletQName;
-import javax.portlet.annotations.RenderMethod;
-import javax.portlet.annotations.ServeResourceMethod;
-
import javax.xml.namespace.QName;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanFilterMethodInvoker.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanFilterMethodInvoker.java
index ebfa0c296b14b3..c8c93dc854d22d 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanFilterMethodInvoker.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanFilterMethodInvoker.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.extension;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethod.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethod.java
index b61b5bdfcdbaf9..da272aa7edef97 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethod.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethod.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.extension;
-import java.lang.reflect.Method;
+import jakarta.portlet.PortletMode;
-import javax.portlet.PortletMode;
+import java.lang.reflect.Method;
import javax.xml.namespace.QName;
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodDecorator.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodDecorator.java
index b2d44b0e4677dc..866cbdb0d79040 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodDecorator.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodDecorator.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.extension;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodInvoker.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodInvoker.java
index f7bb19c79f0d6c..df4842426dd810 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodInvoker.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodInvoker.java
@@ -5,12 +5,12 @@
package com.liferay.bean.portlet.extension;
-import java.util.List;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.List;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodType.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodType.java
index 5e4d2733b342e7..79bd3caec78d6a 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodType.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodType.java
@@ -9,31 +9,31 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.EventRequest;
+import jakarta.portlet.EventResponse;
+import jakarta.portlet.HeaderRequest;
+import jakarta.portlet.HeaderResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.annotations.ActionMethod;
+import jakarta.portlet.annotations.DestroyMethod;
+import jakarta.portlet.annotations.EventMethod;
+import jakarta.portlet.annotations.HeaderMethod;
+import jakarta.portlet.annotations.InitMethod;
+import jakarta.portlet.annotations.RenderMethod;
+import jakarta.portlet.annotations.ServeResourceMethod;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.function.Function;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.HeaderRequest;
-import javax.portlet.HeaderResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletMode;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.annotations.ActionMethod;
-import javax.portlet.annotations.DestroyMethod;
-import javax.portlet.annotations.EventMethod;
-import javax.portlet.annotations.HeaderMethod;
-import javax.portlet.annotations.InitMethod;
-import javax.portlet.annotations.RenderMethod;
-import javax.portlet.annotations.ServeResourceMethod;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodWrapper.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodWrapper.java
index 6040378388f1ab..cd906b105ebb75 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodWrapper.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/BeanPortletMethodWrapper.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.extension;
-import java.lang.reflect.Method;
+import jakarta.portlet.PortletMode;
-import javax.portlet.PortletMode;
+import java.lang.reflect.Method;
import javax.xml.namespace.QName;
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/CSRFLiferayPortletURL.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/CSRFLiferayPortletURL.java
index ab1628968a10f7..f3e360ff789b83 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/CSRFLiferayPortletURL.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/CSRFLiferayPortletURL.java
@@ -8,6 +8,13 @@
import com.liferay.portal.kernel.portlet.LiferayPortletURL;
import com.liferay.portal.kernel.util.ArrayUtil;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.MutableResourceParameters;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.annotations.PortletSerializable;
+
import java.io.Writer;
import java.util.HashMap;
@@ -15,13 +22,6 @@
import java.util.Set;
import java.util.function.BiConsumer;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.MutableResourceParameters;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.WindowState;
-import javax.portlet.annotations.PortletSerializable;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/ViewRenderer.java b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/ViewRenderer.java
index f459721e2b4aae..57f032bd7019ea 100644
--- a/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/ViewRenderer.java
+++ b/modules/apps/bean-portlet/bean-portlet-extension-api/src/main/java/com/liferay/bean/portlet/extension/ViewRenderer.java
@@ -5,10 +5,10 @@
package com.liferay.bean.portlet.extension;
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/build.gradle b/modules/apps/bean-portlet/bean-portlet-registration-api/build.gradle
index 8fa2b7d55a7a1b..833a1a427bd999 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/build.gradle
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay", name: "org.osgi.service.http.whiteboard", version: "1.1.1.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
- compileOnly group: "org.osgi", name: "org.osgi.service.http.whiteboard", version: "1.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:bean-portlet:bean-portlet-api")
compileOnly project(":apps:bean-portlet:bean-portlet-extension-api")
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/BeanPortletImpl.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/BeanPortletImpl.java
index b2710b00fdee8c..63df88f19e2679 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/BeanPortletImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/BeanPortletImpl.java
@@ -16,6 +16,9 @@
import com.liferay.portal.kernel.util.LocaleUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.annotations.ServeResourceMethod;
+
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -31,9 +34,6 @@
import java.util.Map;
import java.util.Set;
-import javax.portlet.PortletMode;
-import javax.portlet.annotations.ServeResourceMethod;
-
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
@@ -272,11 +272,11 @@ public Dictionary toDictionary(BeanApp beanApp) {
}
}
- // javax.portlet.async-supported
+ // jakarta.portlet.async-supported
- dictionary.put("javax.portlet.async-supported", isAsyncSupported());
+ dictionary.put("jakarta.portlet.async-supported", isAsyncSupported());
- // javax.portlet.container-runtime-options
+ // jakarta.portlet.container-runtime-options
Map> containerRuntimeOptions =
HashMapBuilder.create(
@@ -289,20 +289,21 @@ public Dictionary toDictionary(BeanApp beanApp) {
containerRuntimeOptions.entrySet()) {
dictionary.put(
- "javax.portlet.container-runtime-option.".concat(
+ "jakarta.portlet.container-runtime-option.".concat(
entry.getKey()),
entry.getValue());
}
- // javax.portlet.default-namespace
+ // jakarta.portlet.default-namespace
String defaultNamespace = beanApp.getDefaultNamespace();
if (defaultNamespace != null) {
- dictionary.put("javax.portlet.default-namespace", defaultNamespace);
+ dictionary.put(
+ "jakarta.portlet.default-namespace", defaultNamespace);
}
- // javax.portlet.dependency
+ // jakarta.portlet.dependency
Set portletDependencies = getPortletDependencies();
@@ -314,10 +315,10 @@ public Dictionary toDictionary(BeanApp beanApp) {
}
dictionary.put(
- "javax.portlet.dependency", tokenizedPortletDependencies);
+ "jakarta.portlet.dependency", tokenizedPortletDependencies);
}
- // javax.portlet.event-definition
+ // jakarta.portlet.event-definition
List events = beanApp.getEvents();
@@ -349,14 +350,16 @@ public Dictionary toDictionary(BeanApp beanApp) {
}
if (!eventDefinitions.isEmpty()) {
- dictionary.put("javax.portlet.event-definition", eventDefinitions);
+ dictionary.put(
+ "jakarta.portlet.event-definition", eventDefinitions);
}
- // javax.portlet.expiration-cache
+ // jakarta.portlet.expiration-cache
- dictionary.put("javax.portlet.expiration-cache", getExpirationCache());
+ dictionary.put(
+ "jakarta.portlet.expiration-cache", getExpirationCache());
- // javax.portlet.init-param
+ // jakarta.portlet.init-param
Map initParams = getInitParams();
@@ -365,72 +368,72 @@ public Dictionary toDictionary(BeanApp beanApp) {
if (value != null) {
dictionary.put(
- "javax.portlet.init-param." + entry.getKey(), value);
+ "jakarta.portlet.init-param." + entry.getKey(), value);
}
}
- // javax.portlet.description
+ // jakarta.portlet.description
_putEnglishText(
- getDescriptions(), dictionary, "javax.portlet.description");
+ getDescriptions(), dictionary, "jakarta.portlet.description");
- // javax.portlet.display-name
+ // jakarta.portlet.display-name
_putEnglishText(
- getDisplayNames(), dictionary, "javax.portlet.display-name");
+ getDisplayNames(), dictionary, "jakarta.portlet.display-name");
- // javax.portlet.info.keywords
+ // jakarta.portlet.info.keywords
_putEnglishText(
- getKeywords(), dictionary, "javax.portlet.info.keywords");
+ getKeywords(), dictionary, "jakarta.portlet.info.keywords");
- // javax.portlet.info.short-title
+ // jakarta.portlet.info.short-title
_putEnglishText(
- getShortTitles(), dictionary, "javax.portlet.info.short-title");
+ getShortTitles(), dictionary, "jakarta.portlet.info.short-title");
- // javax.portlet.info.title
+ // jakarta.portlet.info.title
Map titles = getTitles();
if (titles.isEmpty()) {
- dictionary.put("javax.portlet.info.title", getPortletName());
+ dictionary.put("jakarta.portlet.info.title", getPortletName());
}
else {
_putEnglishText(
titles, getPortletName(), dictionary,
- "javax.portlet.info.title");
+ "jakarta.portlet.info.title");
}
- // javax.portlet.multipart
+ // jakarta.portlet.multipart
if (_multipartConfig.isSupported()) {
dictionary.put(
- "javax.portlet.multipart.file-size-threshold",
+ "jakarta.portlet.multipart.file-size-threshold",
_multipartConfig.getFileSizeThreshold());
dictionary.put(
- "javax.portlet.multipart.location",
+ "jakarta.portlet.multipart.location",
_multipartConfig.getLocation());
dictionary.put(
- "javax.portlet.multipart.max-file-size",
+ "jakarta.portlet.multipart.max-file-size",
_multipartConfig.getMaxFileSize());
dictionary.put(
- "javax.portlet.multipart.max-request-size",
+ "jakarta.portlet.multipart.max-request-size",
_multipartConfig.getMaxRequestSize());
}
- // javax.portlet.portlet-class
+ // jakarta.portlet.portlet-class
String portletClassName = getPortletClassName();
if (portletClassName != null) {
- dictionary.put("javax.portlet.portlet-class", portletClassName);
+ dictionary.put("jakarta.portlet.portlet-class", portletClassName);
}
- // javax.portlet.portlet-mode
+ // jakarta.portlet.portlet-mode
Set allPortletModes = new HashSet<>(liferayPortletModes);
@@ -466,10 +469,11 @@ titles, getPortletName(), dictionary,
}
if (!supportedPortletModes.isEmpty()) {
- dictionary.put("javax.portlet.portlet-mode", supportedPortletModes);
+ dictionary.put(
+ "jakarta.portlet.portlet-mode", supportedPortletModes);
}
- // javax.portlet.preferences
+ // jakarta.portlet.preferences
StringBundler portletPreferencesSB = new StringBundler();
@@ -502,25 +506,25 @@ titles, getPortletName(), dictionary,
portletPreferencesSB.append("");
dictionary.put(
- "javax.portlet.preferences", portletPreferencesSB.toString());
+ "jakarta.portlet.preferences", portletPreferencesSB.toString());
- // javax.portlet.preferences-validator
+ // jakarta.portlet.preferences-validator
String preferencesValidator = getPreferencesValidator();
if (preferencesValidator != null) {
dictionary.put(
- "javax.portlet.preferences-validator", preferencesValidator);
+ "jakarta.portlet.preferences-validator", preferencesValidator);
}
- // javax.portlet.resource-bundle
+ // jakarta.portlet.resource-bundle
if (Validator.isNotNull(getResourceBundle())) {
dictionary.put(
- "javax.portlet.resource-bundle", getResourceBundle());
+ "jakarta.portlet.resource-bundle", getResourceBundle());
}
- // javax.portlet.security-role-ref
+ // jakarta.portlet.security-role-ref
StringBundler roleNamesSB = new StringBundler();
@@ -535,14 +539,14 @@ titles, getPortletName(), dictionary,
roleNamesSB.setIndex(roleNamesSB.index() - 1);
dictionary.put(
- "javax.portlet.security-role-ref", roleNamesSB.toString());
+ "jakarta.portlet.security-role-ref", roleNamesSB.toString());
}
- // javax.portlet.supported-locale
+ // jakarta.portlet.supported-locale
if (!getSupportedLocales().isEmpty()) {
dictionary.put(
- "javax.portlet.supported-locale", getSupportedLocales());
+ "jakarta.portlet.supported-locale", getSupportedLocales());
}
List supportedPublicRenderParameters = new ArrayList<>();
@@ -555,10 +559,10 @@ titles, getPortletName(), dictionary,
beanApp, identifier)));
}
- // javax.portlet.supported-public-render-parameter
+ // jakarta.portlet.supported-public-render-parameter
dictionary.put(
- "javax.portlet.supported-public-render-parameter",
+ "jakarta.portlet.supported-public-render-parameter",
supportedPublicRenderParameters);
List supportedWindowStates = new ArrayList<>();
@@ -588,13 +592,14 @@ titles, getPortletName(), dictionary,
supportedWindowStates.add(windowStatesSB.toString());
}
- // javax.portlet.window-state
+ // jakarta.portlet.window-state
if (!supportedWindowStatesMap.isEmpty()) {
- dictionary.put("javax.portlet.window-state", supportedWindowStates);
+ dictionary.put(
+ "jakarta.portlet.window-state", supportedWindowStates);
}
- // javax.portlet.supported-processing-event
+ // jakarta.portlet.supported-processing-event
Set supportedProcessingEvents = new HashSet<>();
@@ -605,10 +610,10 @@ titles, getPortletName(), dictionary,
}
dictionary.put(
- "javax.portlet.supported-processing-event",
+ "jakarta.portlet.supported-processing-event",
supportedProcessingEvents);
- // javax.portlet.supported-publishing-event
+ // jakarta.portlet.supported-publishing-event
Set supportedPublishingEvents = new HashSet<>();
@@ -620,17 +625,17 @@ titles, getPortletName(), dictionary,
if (!supportedPublishingEvents.isEmpty()) {
dictionary.put(
- "javax.portlet.supported-publishing-event",
+ "jakarta.portlet.supported-publishing-event",
supportedPublishingEvents);
}
if (!supportedProcessingEvents.isEmpty()) {
dictionary.put(
- "javax.portlet.supported-processing-event",
+ "jakarta.portlet.supported-processing-event",
supportedProcessingEvents);
}
- // javax.portlet.listener
+ // jakarta.portlet.listener
List portletListeners = new ArrayList<>();
@@ -644,12 +649,12 @@ titles, getPortletName(), dictionary,
}
if (!portletListeners.isEmpty()) {
- dictionary.put("javax.portlet.listener", portletListeners);
+ dictionary.put("jakarta.portlet.listener", portletListeners);
}
- // javax.portlet.version
+ // jakarta.portlet.version
- dictionary.put("javax.portlet.version", beanApp.getSpecVersion());
+ dictionary.put("jakarta.portlet.version", beanApp.getSpecVersion());
return dictionary;
}
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/BeanPortletInvokerPortlet.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/BeanPortletInvokerPortlet.java
index c848d1cbb3685d..f9a3ef2a0bfab2 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/BeanPortletInvokerPortlet.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/BeanPortletInvokerPortlet.java
@@ -15,30 +15,30 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.ListUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Event;
+import jakarta.portlet.EventRequest;
+import jakarta.portlet.EventResponse;
+import jakarta.portlet.HeaderRequest;
+import jakarta.portlet.HeaderResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Event;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.HeaderRequest;
-import javax.portlet.HeaderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilter.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilter.java
index 2cf590324bddab..fc37051954687e 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilter.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilter.java
@@ -5,12 +5,12 @@
package com.liferay.bean.portlet.registration.portlet.filter;
+import jakarta.portlet.filter.PortletFilter;
+
import java.util.Dictionary;
import java.util.Map;
import java.util.Set;
-import javax.portlet.filter.PortletFilter;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilterImpl.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilterImpl.java
index ac599f639acf07..23882675070ff9 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilterImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilterImpl.java
@@ -7,12 +7,12 @@
import com.liferay.portal.kernel.util.HashMapDictionary;
+import jakarta.portlet.filter.PortletFilter;
+
import java.util.Dictionary;
import java.util.Map;
import java.util.Set;
-import javax.portlet.filter.PortletFilter;
-
/**
* @author Neil Griffin
*/
@@ -78,7 +78,8 @@ public Dictionary toDictionary() {
if (value != null) {
dictionary.put(
- "javax.portlet.init-param.".concat(entry.getKey()), value);
+ "jakarta.portlet.init-param.".concat(entry.getKey()),
+ value);
}
}
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilterInvokerPortletFilter.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilterInvokerPortletFilter.java
index 2d9166ac844f84..18be693296a416 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilterInvokerPortletFilter.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/filter/BeanFilterInvokerPortletFilter.java
@@ -11,33 +11,33 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.EventRequest;
+import jakarta.portlet.EventResponse;
+import jakarta.portlet.HeaderRequest;
+import jakarta.portlet.HeaderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.filter.ActionFilter;
+import jakarta.portlet.filter.EventFilter;
+import jakarta.portlet.filter.FilterChain;
+import jakarta.portlet.filter.FilterConfig;
+import jakarta.portlet.filter.HeaderFilter;
+import jakarta.portlet.filter.HeaderFilterChain;
+import jakarta.portlet.filter.PortletFilter;
+import jakarta.portlet.filter.RenderFilter;
+import jakarta.portlet.filter.ResourceFilter;
+
import java.io.IOException;
import java.lang.reflect.Method;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.HeaderRequest;
-import javax.portlet.HeaderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.filter.ActionFilter;
-import javax.portlet.filter.EventFilter;
-import javax.portlet.filter.FilterChain;
-import javax.portlet.filter.FilterConfig;
-import javax.portlet.filter.HeaderFilter;
-import javax.portlet.filter.HeaderFilterChain;
-import javax.portlet.filter.PortletFilter;
-import javax.portlet.filter.RenderFilter;
-import javax.portlet.filter.ResourceFilter;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/BeanMethodIndexUtil.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/BeanMethodIndexUtil.java
index badfe2a695410a..dabee9b9ea2048 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/BeanMethodIndexUtil.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/BeanMethodIndexUtil.java
@@ -8,6 +8,10 @@
import com.liferay.bean.portlet.extension.BeanPortletMethod;
import com.liferay.bean.portlet.extension.BeanPortletMethodType;
+import jakarta.portlet.annotations.ActionMethod;
+import jakarta.portlet.annotations.EventMethod;
+import jakarta.portlet.annotations.PortletQName;
+
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -17,10 +21,6 @@
import java.util.Map;
import java.util.Set;
-import javax.portlet.annotations.ActionMethod;
-import javax.portlet.annotations.EventMethod;
-import javax.portlet.annotations.PortletQName;
-
import javax.xml.namespace.QName;
/**
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/PortletQNameUtil.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/PortletQNameUtil.java
index e93c74d6d23191..04bfc02496d20c 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/PortletQNameUtil.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/PortletQNameUtil.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.xml.Element;
import com.liferay.portal.kernel.xml.QName;
-import javax.portlet.annotations.PortletQName;
+import jakarta.portlet.annotations.PortletQName;
/**
* @author Shuyang Zhou
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/PortletScannerUtil.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/PortletScannerUtil.java
index 93be6bea0e3a17..0ae5c9a85d5893 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/PortletScannerUtil.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/PortletScannerUtil.java
@@ -11,33 +11,33 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.EventPortlet;
+import jakarta.portlet.EventRequest;
+import jakarta.portlet.EventResponse;
+import jakarta.portlet.HeaderPortlet;
+import jakarta.portlet.HeaderRequest;
+import jakarta.portlet.HeaderResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.ResourceServingPortlet;
+import jakarta.portlet.annotations.ActionMethod;
+import jakarta.portlet.annotations.DestroyMethod;
+import jakarta.portlet.annotations.EventMethod;
+import jakarta.portlet.annotations.HeaderMethod;
+import jakarta.portlet.annotations.InitMethod;
+import jakarta.portlet.annotations.RenderMethod;
+import jakarta.portlet.annotations.ServeResourceMethod;
+
import java.lang.reflect.Method;
import java.util.Set;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.EventPortlet;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.HeaderPortlet;
-import javax.portlet.HeaderRequest;
-import javax.portlet.HeaderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletConfig;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.ResourceServingPortlet;
-import javax.portlet.annotations.ActionMethod;
-import javax.portlet.annotations.DestroyMethod;
-import javax.portlet.annotations.EventMethod;
-import javax.portlet.annotations.HeaderMethod;
-import javax.portlet.annotations.InitMethod;
-import javax.portlet.annotations.RenderMethod;
-import javax.portlet.annotations.ServeResourceMethod;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/RegistrationUtil.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/RegistrationUtil.java
index 19e47b81466175..9552b7e40923ca 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/RegistrationUtil.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/util/RegistrationUtil.java
@@ -24,17 +24,17 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.filter.PortletFilter;
+
+import jakarta.servlet.ServletContext;
+
import java.util.ArrayList;
import java.util.Dictionary;
import java.util.List;
import java.util.Objects;
import java.util.Set;
-import javax.portlet.Portlet;
-import javax.portlet.filter.PortletFilter;
-
-import javax.servlet.ServletContext;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -115,7 +115,7 @@ public static ServiceRegistration registerBeanPortlet(
Dictionary dictionary = beanPortlet.toDictionary(
beanApp);
- dictionary.put("javax.portlet.name", portletId);
+ dictionary.put("jakarta.portlet.name", portletId);
Bundle bundle = bundleContext.getBundle();
@@ -192,7 +192,7 @@ private static ServiceRegistration _registerBeanFilter(
Dictionary dictionary = beanFilter.toDictionary();
- dictionary.put("javax.portlet.name", portletId);
+ dictionary.put("jakarta.portlet.name", portletId);
return bundleContext.registerService(
PortletFilter.class,
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/xml/PortletDescriptorParser.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/xml/PortletDescriptorParser.java
index d74c9ac03b7730..63b0483819f8b7 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/xml/PortletDescriptorParser.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/portlet/xml/PortletDescriptorParser.java
@@ -39,6 +39,10 @@
import com.liferay.portal.kernel.xml.Element;
import com.liferay.portal.kernel.xml.UnsecureSAXReaderUtil;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.filter.PortletFilter;
+
import java.net.URL;
import java.util.AbstractMap;
@@ -52,10 +56,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-import javax.portlet.filter.PortletFilter;
-
import javax.xml.namespace.QName;
import org.osgi.framework.Bundle;
diff --git a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/util/BeanPortletRegistrarUtil.java b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/util/BeanPortletRegistrarUtil.java
index 608310b112115d..a22aabb235b0a1 100644
--- a/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/util/BeanPortletRegistrarUtil.java
+++ b/modules/apps/bean-portlet/bean-portlet-registration-api/src/main/java/com/liferay/bean/portlet/registration/util/BeanPortletRegistrarUtil.java
@@ -46,6 +46,37 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.annotations.CustomPortletMode;
+import jakarta.portlet.annotations.CustomWindowState;
+import jakarta.portlet.annotations.Dependency;
+import jakarta.portlet.annotations.EventDefinition;
+import jakarta.portlet.annotations.InitParameter;
+import jakarta.portlet.annotations.LocaleString;
+import jakarta.portlet.annotations.Multipart;
+import jakarta.portlet.annotations.PortletApplication;
+import jakarta.portlet.annotations.PortletConfiguration;
+import jakarta.portlet.annotations.PortletConfigurations;
+import jakarta.portlet.annotations.PortletLifecycleFilter;
+import jakarta.portlet.annotations.PortletListener;
+import jakarta.portlet.annotations.PortletPreferencesValidator;
+import jakarta.portlet.annotations.PortletQName;
+import jakarta.portlet.annotations.PublicRenderParameterDefinition;
+import jakarta.portlet.annotations.RuntimeOption;
+import jakarta.portlet.annotations.SecurityRoleRef;
+import jakarta.portlet.annotations.Supports;
+import jakarta.portlet.annotations.UserAttribute;
+import jakarta.portlet.filter.ActionFilter;
+import jakarta.portlet.filter.EventFilter;
+import jakarta.portlet.filter.HeaderFilter;
+import jakarta.portlet.filter.PortletFilter;
+import jakarta.portlet.filter.RenderFilter;
+import jakarta.portlet.filter.ResourceFilter;
+
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
@@ -64,37 +95,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.portlet.Portlet;
-import javax.portlet.PortletRequest;
-import javax.portlet.annotations.CustomPortletMode;
-import javax.portlet.annotations.CustomWindowState;
-import javax.portlet.annotations.Dependency;
-import javax.portlet.annotations.EventDefinition;
-import javax.portlet.annotations.InitParameter;
-import javax.portlet.annotations.LocaleString;
-import javax.portlet.annotations.Multipart;
-import javax.portlet.annotations.PortletApplication;
-import javax.portlet.annotations.PortletConfiguration;
-import javax.portlet.annotations.PortletConfigurations;
-import javax.portlet.annotations.PortletLifecycleFilter;
-import javax.portlet.annotations.PortletListener;
-import javax.portlet.annotations.PortletPreferencesValidator;
-import javax.portlet.annotations.PortletQName;
-import javax.portlet.annotations.PublicRenderParameterDefinition;
-import javax.portlet.annotations.RuntimeOption;
-import javax.portlet.annotations.SecurityRoleRef;
-import javax.portlet.annotations.Supports;
-import javax.portlet.annotations.UserAttribute;
-import javax.portlet.filter.ActionFilter;
-import javax.portlet.filter.EventFilter;
-import javax.portlet.filter.HeaderFilter;
-import javax.portlet.filter.PortletFilter;
-import javax.portlet.filter.RenderFilter;
-import javax.portlet.filter.ResourceFilter;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-
import javax.xml.namespace.QName;
import org.osgi.framework.Bundle;
@@ -313,11 +313,12 @@ public static void unregister(
String[] serviceClasses = (String[])serviceReference.getProperty(
Constants.OBJECTCLASS);
- if (ArrayUtil.contains(serviceClasses, "javax.portlet.Portlet")) {
+ if (ArrayUtil.contains(serviceClasses, "jakarta.portlet.Portlet")) {
totalBeanPortlets++;
}
else if (ArrayUtil.contains(
- serviceClasses, "javax.portlet.filter.PortletFilter")) {
+ serviceClasses,
+ "jakarta.portlet.filter.PortletFilter")) {
totalBeanFilters++;
}
@@ -627,7 +628,7 @@ private static void _addBeanPortlet(
Map preferences = new HashMap<>();
- for (javax.portlet.annotations.Preference preference :
+ for (jakarta.portlet.annotations.Preference preference :
portletConfiguration.prefs()) {
preferences.put(
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/build.gradle b/modules/apps/bean-portlet/bean-portlet-spring-extension/build.gradle
index 90461c3ef18c4c..d8ac68fcf0cc68 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/build.gradle
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/build.gradle
@@ -1,23 +1,24 @@
dependencies {
- compileOnly group: "com.liferay", name: "jakarta.enterprise.cdi", version: "2.0.2.LIFERAY-PATCHED-1"
- compileOnly group: "com.liferay", name: "jakarta.inject", version: "1.0.5.LIFERAY-PATCHED-1"
- compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "2.1.6.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay", name: "org.apache.commons.logging", version: "1.2.LIFERAY-PATCHED-2"
compileOnly group: "com.liferay", name: "org.springframework.beans", version: "5.3.39.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay", name: "org.springframework.context", version: "5.3.39.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.springframework.web", version: "5.3.39.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.enterprise", name: "jakarta.enterprise.cdi-api", version: "4.1.0"
+ compileOnly group: "jakarta.enterprise", name: "jakarta.enterprise.cdi-el-api", version: "4.1.0"
+ compileOnly group: "jakarta.inject", name: "jakarta.inject-api", version: "2.0.1"
+ compileOnly group: "jakarta.mvc", name: "jakarta.mvc-api", version: "2.1.0"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "javax.el", name: "javax.el-api", version: "3.0.0"
- compileOnly group: "javax.mvc", name: "javax.mvc-api", version: "1.0.0"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
compileOnly group: "org.apache.servicemix.specs", name: "org.apache.servicemix.specs.annotation-api-1.3", version: "1.3_1"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly group: "org.springframework", name: "spring-aop", version: "5.3.39"
compileOnly group: "org.springframework", name: "spring-core", version: "5.3.39"
- compileOnly group: "org.springframework", name: "spring-web", version: "5.3.39"
compileOnly project(":apps:bean-portlet:bean-portlet-extension-api")
compileOnly project(":apps:bean-portlet:bean-portlet-registration-api")
compileOnly project(":core:petra:petra-function")
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/PortletScopeResolver.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/PortletScopeResolver.java
index cd7051cfeab0a2..bcd43ce5d6f65e 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/PortletScopeResolver.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/PortletScopeResolver.java
@@ -9,18 +9,18 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.GetterUtil;
-import java.util.List;
-import java.util.Set;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.annotations.PortletRequestScoped;
+import jakarta.portlet.annotations.PortletSerializable;
+import jakarta.portlet.annotations.PortletSessionScoped;
+import jakarta.portlet.annotations.RenderStateScoped;
-import javax.portlet.PortletSession;
-import javax.portlet.annotations.PortletRequestScoped;
-import javax.portlet.annotations.PortletSerializable;
-import javax.portlet.annotations.PortletSessionScoped;
-import javax.portlet.annotations.RenderStateScoped;
+import java.util.List;
+import java.util.Set;
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/PortletTypeFilter.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/PortletTypeFilter.java
index 19be93aa546c24..690785f2a6f557 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/PortletTypeFilter.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/PortletTypeFilter.java
@@ -5,34 +5,34 @@
package com.liferay.bean.portlet.spring.extension;
-import java.io.IOException;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.context.SessionScoped;
+
+import jakarta.portlet.EventPortlet;
+import jakarta.portlet.HeaderPortlet;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletAsyncListener;
+import jakarta.portlet.ResourceServingPortlet;
+import jakarta.portlet.annotations.ActionMethod;
+import jakarta.portlet.annotations.DestroyMethod;
+import jakarta.portlet.annotations.EventMethod;
+import jakarta.portlet.annotations.HeaderMethod;
+import jakarta.portlet.annotations.InitMethod;
+import jakarta.portlet.annotations.PortletLifecycleFilter;
+import jakarta.portlet.annotations.PortletRequestScoped;
+import jakarta.portlet.annotations.PortletSessionScoped;
+import jakarta.portlet.annotations.RenderMethod;
+import jakarta.portlet.annotations.RenderStateScoped;
+import jakarta.portlet.annotations.ServeResourceMethod;
+import jakarta.portlet.filter.ActionFilter;
+import jakarta.portlet.filter.EventFilter;
+import jakarta.portlet.filter.HeaderFilter;
+import jakarta.portlet.filter.RenderFilter;
+import jakarta.portlet.filter.ResourceFilter;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.context.SessionScoped;
-
-import javax.portlet.EventPortlet;
-import javax.portlet.HeaderPortlet;
-import javax.portlet.Portlet;
-import javax.portlet.PortletAsyncListener;
-import javax.portlet.ResourceServingPortlet;
-import javax.portlet.annotations.ActionMethod;
-import javax.portlet.annotations.DestroyMethod;
-import javax.portlet.annotations.EventMethod;
-import javax.portlet.annotations.HeaderMethod;
-import javax.portlet.annotations.InitMethod;
-import javax.portlet.annotations.PortletLifecycleFilter;
-import javax.portlet.annotations.PortletRequestScoped;
-import javax.portlet.annotations.PortletSessionScoped;
-import javax.portlet.annotations.RenderMethod;
-import javax.portlet.annotations.RenderStateScoped;
-import javax.portlet.annotations.ServeResourceMethod;
-import javax.portlet.filter.ActionFilter;
-import javax.portlet.filter.EventFilter;
-import javax.portlet.filter.HeaderFilter;
-import javax.portlet.filter.RenderFilter;
-import javax.portlet.filter.ResourceFilter;
+import java.io.IOException;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.ClassMetadata;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR330BeanPortletPostProcessor.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR330BeanPortletPostProcessor.java
index 12ecc6fb7595c5..9a3d9419720947 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR330BeanPortletPostProcessor.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR330BeanPortletPostProcessor.java
@@ -51,7 +51,7 @@ public JSR330BeanPortletPostProcessor() {
@SuppressWarnings("unchecked")
Class extends Annotation> injectAnnotation =
(Class extends Annotation>)ClassUtils.forName(
- "javax.inject.Inject",
+ "jakarta.inject.Inject",
JSR330BeanPortletPostProcessor.class.getClassLoader());
_autowiredAnnotationTypes.add(injectAnnotation);
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR330InjectedFieldElement.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR330InjectedFieldElement.java
index 87e59a95ff877d..0d60ce8627352d 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR330InjectedFieldElement.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR330InjectedFieldElement.java
@@ -76,12 +76,12 @@ protected void inject(
String name = annotationType.getName();
- if (name.equals("javax.ws.rs.CookieParam") ||
- name.equals("javax.ws.rs.FormParam") ||
- name.equals("javax.ws.rs.HeaderParam") ||
- name.equals("javax.ws.rs.MatrixParam") ||
- name.equals("javax.ws.rs.PathParam") ||
- name.equals("javax.ws.rs.QueryParam")) {
+ if (name.equals("jakarta.ws.rs.CookieParam") ||
+ name.equals("jakarta.ws.rs.FormParam") ||
+ name.equals("jakarta.ws.rs.HeaderParam") ||
+ name.equals("jakarta.ws.rs.MatrixParam") ||
+ name.equals("jakarta.ws.rs.PathParam") ||
+ name.equals("jakarta.ws.rs.QueryParam")) {
nullInjectionPermitted = true;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR362AutowireCandidateResolver.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR362AutowireCandidateResolver.java
index 5187119b30ba70..bbc9b78ed4f725 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR362AutowireCandidateResolver.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/JSR362AutowireCandidateResolver.java
@@ -5,12 +5,12 @@
package com.liferay.bean.portlet.spring.extension.internal;
-import java.lang.annotation.Annotation;
+import jakarta.portlet.annotations.ContextPath;
+import jakarta.portlet.annotations.Namespace;
+import jakarta.portlet.annotations.PortletName;
+import jakarta.portlet.annotations.WindowId;
-import javax.portlet.annotations.ContextPath;
-import javax.portlet.annotations.Namespace;
-import javax.portlet.annotations.PortletName;
-import javax.portlet.annotations.WindowId;
+import java.lang.annotation.Annotation;
import org.springframework.context.annotation.ContextAnnotationAutowireCandidateResolver;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanELResolver.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanELResolver.java
index 1c6102ed03923a..1b1ec39bcc3598 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanELResolver.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanELResolver.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.spring.extension.internal;
-import java.beans.FeatureDescriptor;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
-import java.util.Iterator;
+import jakarta.portlet.PortletRequest;
-import javax.el.ELContext;
-import javax.el.ELResolver;
+import java.beans.FeatureDescriptor;
-import javax.portlet.PortletRequest;
+import java.util.Iterator;
import org.springframework.beans.factory.BeanFactory;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanPortletExtension.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanPortletExtension.java
index 0fee14d473f179..b2d9f4c606b444 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanPortletExtension.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanPortletExtension.java
@@ -27,6 +27,39 @@
import com.liferay.portal.kernel.util.HashMapDictionaryBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionParameters;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.EventPortlet;
+import jakarta.portlet.HeaderPortlet;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletAsyncListener;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletRequestDispatcher;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.ResourceServingPortlet;
+import jakarta.portlet.annotations.ActionMethod;
+import jakarta.portlet.annotations.DestroyMethod;
+import jakarta.portlet.annotations.EventMethod;
+import jakarta.portlet.annotations.RenderMethod;
+import jakarta.portlet.annotations.ServeResourceMethod;
+import jakarta.portlet.filter.ActionFilter;
+import jakarta.portlet.filter.EventFilter;
+import jakarta.portlet.filter.HeaderFilter;
+import jakarta.portlet.filter.RenderFilter;
+import jakarta.portlet.filter.ResourceFilter;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+
import java.io.PrintWriter;
import java.lang.annotation.Annotation;
@@ -41,39 +74,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.portlet.ActionParameters;
-import javax.portlet.ActionRequest;
-import javax.portlet.EventPortlet;
-import javax.portlet.HeaderPortlet;
-import javax.portlet.MimeResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletAsyncListener;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.ResourceServingPortlet;
-import javax.portlet.annotations.ActionMethod;
-import javax.portlet.annotations.DestroyMethod;
-import javax.portlet.annotations.EventMethod;
-import javax.portlet.annotations.RenderMethod;
-import javax.portlet.annotations.ServeResourceMethod;
-import javax.portlet.filter.ActionFilter;
-import javax.portlet.filter.EventFilter;
-import javax.portlet.filter.HeaderFilter;
-import javax.portlet.filter.RenderFilter;
-import javax.portlet.filter.ResourceFilter;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanPortletFilter.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanPortletFilter.java
index cb406301700554..9343ef10953f1c 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanPortletFilter.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringBeanPortletFilter.java
@@ -5,29 +5,29 @@
package com.liferay.bean.portlet.spring.extension.internal;
-import java.io.IOException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.EventRequest;
+import jakarta.portlet.EventResponse;
+import jakarta.portlet.HeaderRequest;
+import jakarta.portlet.HeaderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.annotations.PortletLifecycleFilter;
+import jakarta.portlet.filter.ActionFilter;
+import jakarta.portlet.filter.EventFilter;
+import jakarta.portlet.filter.FilterChain;
+import jakarta.portlet.filter.FilterConfig;
+import jakarta.portlet.filter.HeaderFilter;
+import jakarta.portlet.filter.HeaderFilterChain;
+import jakarta.portlet.filter.RenderFilter;
+import jakarta.portlet.filter.ResourceFilter;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.HeaderRequest;
-import javax.portlet.HeaderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.annotations.PortletLifecycleFilter;
-import javax.portlet.filter.ActionFilter;
-import javax.portlet.filter.EventFilter;
-import javax.portlet.filter.FilterChain;
-import javax.portlet.filter.FilterConfig;
-import javax.portlet.filter.HeaderFilter;
-import javax.portlet.filter.HeaderFilterChain;
-import javax.portlet.filter.RenderFilter;
-import javax.portlet.filter.ResourceFilter;
+import java.io.IOException;
import org.springframework.context.i18n.LocaleContext;
import org.springframework.context.i18n.LocaleContextHolder;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringHttpSessionListener.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringHttpSessionListener.java
index 2659d03d010810..930e22008d4f89 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringHttpSessionListener.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringHttpSessionListener.java
@@ -5,10 +5,10 @@
package com.liferay.bean.portlet.spring.extension.internal;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringPortletAsyncScopeManager.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringPortletAsyncScopeManager.java
index 6194e36fea77b3..4255de2b1af1d7 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringPortletAsyncScopeManager.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringPortletAsyncScopeManager.java
@@ -11,13 +11,13 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.portlet.async.PortletAsyncScopeManager;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.io.Closeable;
import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringPostProcessor.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringPostProcessor.java
index a41de244490a93..d2beda58b5f12a 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringPostProcessor.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringPostProcessor.java
@@ -8,13 +8,13 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import java.util.Objects;
+import jakarta.portlet.PortletAsyncListener;
-import javax.portlet.PortletAsyncListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.jsp.JspApplicationContext;
+import jakarta.servlet.jsp.JspFactory;
-import javax.servlet.ServletContext;
-import javax.servlet.jsp.JspApplicationContext;
-import javax.servlet.jsp.JspFactory;
+import java.util.Objects;
import org.springframework.aop.scope.ScopedProxyUtils;
import org.springframework.beans.BeansException;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringServletContainerInitializer.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringServletContainerInitializer.java
index 89276003f2a44a..dc5ee43df540d5 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringServletContainerInitializer.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringServletContainerInitializer.java
@@ -9,14 +9,14 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.servlet.ServletContainerInitializer;
+import jakarta.servlet.ServletContext;
+
import java.net.URL;
import java.util.EventListener;
import java.util.Set;
-import javax.servlet.ServletContainerInitializer;
-import javax.servlet.ServletContext;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringServletContextListener.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringServletContextListener.java
index bed07971964235..522670cea36c31 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringServletContextListener.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/SpringServletContextListener.java
@@ -8,9 +8,9 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyClientDataRequest.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyClientDataRequest.java
index ffebd675793964..49075daac70c8b 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyClientDataRequest.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyClientDataRequest.java
@@ -5,15 +5,15 @@
package com.liferay.bean.portlet.spring.extension.internal.beans;
+import jakarta.portlet.ClientDataRequest;
+
+import jakarta.servlet.http.Part;
+
import java.io.BufferedReader;
import java.io.InputStream;
import java.util.Collection;
-import javax.portlet.ClientDataRequest;
-
-import javax.servlet.http.Part;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyMimeResponse.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyMimeResponse.java
index 2d6811a66953a1..59588ce26b033d 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyMimeResponse.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyMimeResponse.java
@@ -5,18 +5,18 @@
package com.liferay.bean.portlet.spring.extension.internal.beans;
+import jakarta.portlet.ActionURL;
+import jakarta.portlet.CacheControl;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderURL;
+import jakarta.portlet.ResourceURL;
+
import java.io.OutputStream;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.portlet.ActionURL;
-import javax.portlet.CacheControl;
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderURL;
-import javax.portlet.ResourceURL;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyPortletRequest.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyPortletRequest.java
index ebf846a2075426..4f7a3da88f9b07 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyPortletRequest.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyPortletRequest.java
@@ -5,23 +5,23 @@
package com.liferay.bean.portlet.spring.extension.internal.beans;
+import jakarta.portlet.PortalContext;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.WindowState;
+
+import jakarta.servlet.http.Cookie;
+
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortalContext;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.WindowState;
-
-import javax.servlet.http.Cookie;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyPortletResponse.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyPortletResponse.java
index c8e06bc3518205..06913b4001dfde 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyPortletResponse.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyPortletResponse.java
@@ -5,11 +5,11 @@
package com.liferay.bean.portlet.spring.extension.internal.beans;
-import java.util.Collection;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletResponse;
+import jakarta.servlet.http.Cookie;
-import javax.servlet.http.Cookie;
+import java.util.Collection;
import org.w3c.dom.Element;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyRenderRequest.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyRenderRequest.java
index 1284993b1f29e0..c604be491eae03 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyRenderRequest.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyRenderRequest.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.spring.extension.internal.beans;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyStateAwareResponse.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyStateAwareResponse.java
index 0235eb6da6b429..4bd70a1c285943 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyStateAwareResponse.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/DummyStateAwareResponse.java
@@ -5,15 +5,15 @@
package com.liferay.bean.portlet.spring.extension.internal.beans;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.StateAwareResponse;
+import jakarta.portlet.WindowState;
+
import java.io.Serializable;
import java.util.Map;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletMode;
-import javax.portlet.StateAwareResponse;
-import javax.portlet.WindowState;
-
import javax.xml.namespace.QName;
/**
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/JSR362SpringBeanProducer.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/JSR362SpringBeanProducer.java
index 383d36e42ada9a..a4c39b7bef299a 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/JSR362SpringBeanProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/JSR362SpringBeanProducer.java
@@ -11,6 +11,35 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.portlet.ActionParameters;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.EventRequest;
+import jakarta.portlet.EventResponse;
+import jakarta.portlet.HeaderRequest;
+import jakarta.portlet.HeaderResponse;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceParameters;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.StateAwareResponse;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.annotations.ContextPath;
+import jakarta.portlet.annotations.Namespace;
+import jakarta.portlet.annotations.PortletName;
+import jakarta.portlet.annotations.WindowId;
+
+import jakarta.servlet.http.Cookie;
+
import java.lang.annotation.Annotation;
import java.util.Arrays;
@@ -18,35 +47,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.ActionParameters;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.EventRequest;
-import javax.portlet.EventResponse;
-import javax.portlet.HeaderRequest;
-import javax.portlet.HeaderResponse;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceParameters;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import javax.portlet.StateAwareResponse;
-import javax.portlet.WindowState;
-import javax.portlet.annotations.ContextPath;
-import javax.portlet.annotations.Namespace;
-import javax.portlet.annotations.PortletName;
-import javax.portlet.annotations.WindowId;
-
-import javax.servlet.http.Cookie;
-
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringClientDataRequestBean.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringClientDataRequestBean.java
index 0c041cb3abe044..9ac11f0b33737b 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringClientDataRequestBean.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringClientDataRequestBean.java
@@ -8,6 +8,25 @@
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManager;
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManagerThreadLocal;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.Priority;
+
+import jakarta.portlet.ClientDataRequest;
+import jakarta.portlet.PortalContext;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.RenderState;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.filter.ClientDataRequestWrapper;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.Part;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -20,25 +39,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.annotation.ManagedBean;
-import javax.annotation.Priority;
-
-import javax.portlet.ClientDataRequest;
-import javax.portlet.PortalContext;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.RenderState;
-import javax.portlet.WindowState;
-import javax.portlet.filter.ClientDataRequestWrapper;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.Part;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringMimeResponseBean.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringMimeResponseBean.java
index d5c78689a2e158..6a5a465a9b186f 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringMimeResponseBean.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringMimeResponseBean.java
@@ -8,6 +8,20 @@
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManager;
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManagerThreadLocal;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.Priority;
+
+import jakarta.portlet.ActionURL;
+import jakarta.portlet.CacheControl;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderURL;
+import jakarta.portlet.ResourceURL;
+import jakarta.portlet.filter.MimeResponseWrapper;
+
+import jakarta.servlet.http.Cookie;
+
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
@@ -15,20 +29,6 @@
import java.util.Collection;
import java.util.Locale;
-import javax.annotation.ManagedBean;
-import javax.annotation.Priority;
-
-import javax.portlet.ActionURL;
-import javax.portlet.CacheControl;
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderURL;
-import javax.portlet.ResourceURL;
-import javax.portlet.filter.MimeResponseWrapper;
-
-import javax.servlet.http.Cookie;
-
import org.w3c.dom.Element;
/**
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringPortletRequestBean.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringPortletRequestBean.java
index fa6b54f97434c4..d8f8cda03c2d66 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringPortletRequestBean.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringPortletRequestBean.java
@@ -8,28 +8,28 @@
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManager;
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManagerThreadLocal;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.Priority;
+
+import jakarta.portlet.PortalContext;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.RenderState;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.filter.PortletRequestWrapper;
+
+import jakarta.servlet.http.Cookie;
+
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.ManagedBean;
-import javax.annotation.Priority;
-
-import javax.portlet.PortalContext;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.RenderState;
-import javax.portlet.WindowState;
-import javax.portlet.filter.PortletRequestWrapper;
-
-import javax.servlet.http.Cookie;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringPortletResponseBean.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringPortletResponseBean.java
index 7c74d7cb524c25..8e184202d640ce 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringPortletResponseBean.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringPortletResponseBean.java
@@ -8,15 +8,15 @@
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManager;
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManagerThreadLocal;
-import java.util.Collection;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.Priority;
-import javax.annotation.ManagedBean;
-import javax.annotation.Priority;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.filter.PortletResponseWrapper;
-import javax.portlet.PortletResponse;
-import javax.portlet.filter.PortletResponseWrapper;
+import jakarta.servlet.http.Cookie;
-import javax.servlet.http.Cookie;
+import java.util.Collection;
import org.w3c.dom.Element;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringRenderRequestBean.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringRenderRequestBean.java
index ea95e2455e2ff9..2cd98fc3210e4d 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringRenderRequestBean.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringRenderRequestBean.java
@@ -8,29 +8,29 @@
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManager;
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManagerThreadLocal;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.Priority;
+
+import jakarta.portlet.PortalContext;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderState;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.filter.RenderRequestWrapper;
+
+import jakarta.servlet.http.Cookie;
+
import java.security.Principal;
import java.util.Enumeration;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.ManagedBean;
-import javax.annotation.Priority;
-
-import javax.portlet.PortalContext;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderState;
-import javax.portlet.WindowState;
-import javax.portlet.filter.RenderRequestWrapper;
-
-import javax.servlet.http.Cookie;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringStateAwareResponseBean.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringStateAwareResponseBean.java
index 7a538d36603e4a..697a3fa92959d7 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringStateAwareResponseBean.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/beans/SpringStateAwareResponseBean.java
@@ -8,24 +8,24 @@
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManager;
import com.liferay.bean.portlet.spring.extension.internal.scope.SpringScopedBeanManagerThreadLocal;
-import java.io.Serializable;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.Priority;
-import java.util.Collection;
-import java.util.Map;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletModeException;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.StateAwareResponse;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
+import jakarta.portlet.filter.StateAwareResponseWrapper;
-import javax.annotation.ManagedBean;
-import javax.annotation.Priority;
+import jakarta.servlet.http.Cookie;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletModeException;
-import javax.portlet.PortletResponse;
-import javax.portlet.StateAwareResponse;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
-import javax.portlet.filter.StateAwareResponseWrapper;
+import java.io.Serializable;
-import javax.servlet.http.Cookie;
+import java.util.Collection;
+import java.util.Map;
import javax.xml.namespace.QName;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/AfterControllerEventImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/AfterControllerEventImpl.java
index f9ea2adf4daa8f..a5277c8a2dbebd 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/AfterControllerEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/AfterControllerEventImpl.java
@@ -5,10 +5,10 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.event.AfterControllerEvent;
+import jakarta.mvc.event.AfterControllerEvent;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.UriInfo;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/AfterProcessViewEventImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/AfterProcessViewEventImpl.java
index 2362acd9d87dc8..7e89ce41d1d916 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/AfterProcessViewEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/AfterProcessViewEventImpl.java
@@ -5,8 +5,8 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.engine.ViewEngine;
-import javax.mvc.event.AfterProcessViewEvent;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.event.AfterProcessViewEvent;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseControllerEventImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseControllerEventImpl.java
index 5ebe2f4a8c4640..6633a93d88c348 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseControllerEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseControllerEventImpl.java
@@ -5,8 +5,8 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.UriInfo;
import org.springframework.context.ApplicationEvent;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseProcessViewEventImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseProcessViewEventImpl.java
index 0481ab939f6610..66c1ee6c4c3c4a 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseProcessViewEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseProcessViewEventImpl.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.engine.ViewEngine;
+import jakarta.mvc.engine.ViewEngine;
import org.springframework.context.ApplicationEvent;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseViewEngineContext.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseViewEngineContext.java
index 6718cb13c3a103..8459e871094faf 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseViewEngineContext.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BaseViewEngineContext.java
@@ -9,20 +9,20 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import java.io.IOException;
-import java.io.OutputStream;
+import jakarta.mvc.engine.ViewEngineContext;
-import java.util.Locale;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletRequest;
-import javax.mvc.engine.ViewEngineContext;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletRequest;
+import java.io.IOException;
+import java.io.OutputStream;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
+import java.util.Locale;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanPortletMethodDecoratorMVCImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanPortletMethodDecoratorMVCImpl.java
index 89ed375c6a8397..802fbda086ad39 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanPortletMethodDecoratorMVCImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanPortletMethodDecoratorMVCImpl.java
@@ -10,26 +10,26 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import java.beans.BeanInfo;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
+import jakarta.annotation.ManagedBean;
-import java.lang.reflect.Method;
+import jakarta.mvc.Controller;
+import jakarta.mvc.MvcContext;
+import jakarta.mvc.binding.BindingResult;
-import javax.annotation.ManagedBean;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.mvc.Controller;
-import javax.mvc.MvcContext;
-import javax.mvc.binding.BindingResult;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Validator;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.ws.rs.core.Configuration;
-import javax.validation.MessageInterpolator;
-import javax.validation.Validator;
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
-import javax.ws.rs.core.Configuration;
+import java.lang.reflect.Method;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationInterceptor.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationInterceptor.java
index 235bea5d11cc14..524b5a2a9773c3 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationInterceptor.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationInterceptor.java
@@ -7,23 +7,23 @@
import com.liferay.bean.portlet.extension.BeanPortletMethod;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
+import jakarta.mvc.MvcContext;
-import java.util.Set;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ElementKind;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Path;
+import jakarta.validation.Validator;
-import javax.mvc.MvcContext;
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.QueryParam;
-import javax.validation.ConstraintViolation;
-import javax.validation.ElementKind;
-import javax.validation.MessageInterpolator;
-import javax.validation.Path;
-import javax.validation.Validator;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.QueryParam;
+import java.util.Set;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationMessageInterpolator.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationMessageInterpolator.java
index a6426706e251fa..644eee494aadd4 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationMessageInterpolator.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationMessageInterpolator.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationProducer.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationProducer.java
index 79120621abac15..3082b7d075c47c 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationProducer.java
@@ -5,11 +5,11 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
-import javax.validation.MessageInterpolator;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationValidator.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationValidator.java
index f4060c83c1fb36..7721886c5cd3a1 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationValidator.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeanValidationValidator.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeforeControllerEventImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeforeControllerEventImpl.java
index 5785a442c3d0ef..59be3f2b536dee 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeforeControllerEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeforeControllerEventImpl.java
@@ -5,10 +5,10 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.event.BeforeControllerEvent;
+import jakarta.mvc.event.BeforeControllerEvent;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.UriInfo;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeforeProcessViewEventImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeforeProcessViewEventImpl.java
index 6d32c15f08f665..8ed48745494148 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeforeProcessViewEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BeforeProcessViewEventImpl.java
@@ -5,8 +5,8 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.engine.ViewEngine;
-import javax.mvc.event.BeforeProcessViewEvent;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.event.BeforeProcessViewEvent;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BindingErrorImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BindingErrorImpl.java
index b683fd84259edb..fa60e69f8a443f 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BindingErrorImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BindingErrorImpl.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.binding.BindingError;
+import jakarta.mvc.binding.BindingError;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BindingResultImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BindingResultImpl.java
index 9412594e34e6a3..95f4e562edaeda 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BindingResultImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/BindingResultImpl.java
@@ -5,6 +5,12 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.annotation.ManagedBean;
+
+import jakarta.mvc.binding.BindingError;
+import jakarta.mvc.binding.ParamError;
+import jakarta.mvc.binding.ValidationError;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -13,12 +19,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.ManagedBean;
-
-import javax.mvc.binding.BindingError;
-import javax.mvc.binding.ParamError;
-import javax.mvc.binding.ValidationError;
-
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ConfigurationImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ConfigurationImpl.java
index 30ec28e24edbe5..b457919db9ea8a 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ConfigurationImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ConfigurationImpl.java
@@ -5,22 +5,22 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.PostConstruct;
+
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletContext;
+
+import jakarta.ws.rs.RuntimeType;
+import jakarta.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Feature;
+
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import javax.annotation.ManagedBean;
-import javax.annotation.PostConstruct;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-
-import javax.ws.rs.RuntimeType;
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.Feature;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ControllerInterceptor.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ControllerInterceptor.java
index 80c8ce09629614..f377f849fde88a 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ControllerInterceptor.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ControllerInterceptor.java
@@ -13,6 +13,23 @@
import com.liferay.portal.kernel.servlet.HttpHeaders;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.mvc.View;
+
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.BaseURL;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.MutableResourceParameters;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.ResourceResponse;
+import jakarta.portlet.filter.RenderURLWrapper;
+import jakarta.portlet.filter.ResourceURLWrapper;
+
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.lang.reflect.Method;
@@ -20,23 +37,6 @@
import java.net.URI;
import java.net.URISyntaxException;
-import javax.mvc.View;
-
-import javax.portlet.ActionResponse;
-import javax.portlet.BaseURL;
-import javax.portlet.MimeResponse;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.MutableResourceParameters;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.ResourceResponse;
-import javax.portlet.filter.RenderURLWrapper;
-import javax.portlet.filter.ResourceURLWrapper;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.springframework.context.ApplicationEventPublisher;
/**
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ControllerRedirectEventImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ControllerRedirectEventImpl.java
index 716bbbfcae81c8..6ac9d1dfd52210 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ControllerRedirectEventImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ControllerRedirectEventImpl.java
@@ -5,12 +5,12 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import java.net.URI;
+import jakarta.mvc.event.ControllerRedirectEvent;
-import javax.mvc.event.ControllerRedirectEvent;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.container.ResourceInfo;
-import javax.ws.rs.core.UriInfo;
+import java.net.URI;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/CsrfImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/CsrfImpl.java
index 1969a474a6176f..13e1d126f6bf8b 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/CsrfImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/CsrfImpl.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.security.Csrf;
+import jakarta.mvc.security.Csrf;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/CsrfValidationInterceptor.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/CsrfValidationInterceptor.java
index ba76fa2e64fcfe..0f5b96ee8e4916 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/CsrfValidationInterceptor.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/CsrfValidationInterceptor.java
@@ -14,14 +14,14 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.lang.reflect.Method;
+import jakarta.mvc.security.Csrf;
+import jakarta.mvc.security.CsrfProtected;
-import javax.mvc.security.Csrf;
-import javax.mvc.security.CsrfProtected;
+import jakarta.portlet.ClientDataRequest;
-import javax.portlet.ClientDataRequest;
+import jakarta.ws.rs.core.Configuration;
-import javax.ws.rs.core.Configuration;
+import java.lang.reflect.Method;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/DescendingPriorityComparator.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/DescendingPriorityComparator.java
index 15e6df6b318dda..63cf1c34c40340 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/DescendingPriorityComparator.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/DescendingPriorityComparator.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import java.util.Comparator;
+import jakarta.annotation.Priority;
-import javax.annotation.Priority;
+import java.util.Comparator;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/EncodersImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/EncodersImpl.java
index be0a9ba8ee5370..626d95e6e52d5f 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/EncodersImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/EncodersImpl.java
@@ -7,9 +7,9 @@
import com.liferay.portal.kernel.util.HtmlUtil;
-import javax.annotation.ManagedBean;
+import jakarta.annotation.ManagedBean;
-import javax.mvc.security.Encoders;
+import jakarta.mvc.security.Encoders;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/LocaleResolverContextImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/LocaleResolverContextImpl.java
index e5456c9f18ced9..af69733474a804 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/LocaleResolverContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/LocaleResolverContextImpl.java
@@ -5,17 +5,17 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.mvc.locale.LocaleResolverContext;
+
+import jakarta.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.mvc.locale.LocaleResolverContext;
-
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/LocaleResolverImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/LocaleResolverImpl.java
index 8cbaaf0f873d01..71972922a1d3f6 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/LocaleResolverImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/LocaleResolverImpl.java
@@ -7,16 +7,16 @@
import com.liferay.portal.kernel.util.LocaleUtil;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.Priority;
+
+import jakarta.mvc.locale.LocaleResolver;
+import jakarta.mvc.locale.LocaleResolverContext;
+
import java.util.List;
import java.util.Locale;
import java.util.Objects;
-import javax.annotation.ManagedBean;
-import javax.annotation.Priority;
-
-import javax.mvc.locale.LocaleResolver;
-import javax.mvc.locale.LocaleResolverContext;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MVCContextImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MVCContextImpl.java
index 067546d279615e..f201c6cd174f6e 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MVCContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MVCContextImpl.java
@@ -11,6 +11,20 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.mvc.MvcContext;
+import jakarta.mvc.locale.LocaleResolver;
+import jakarta.mvc.locale.LocaleResolverContext;
+import jakarta.mvc.security.Csrf;
+import jakarta.mvc.security.Encoders;
+
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.Cookie;
+
+import jakarta.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.UriBuilder;
+
import java.net.URI;
import java.util.Collections;
@@ -20,20 +34,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.mvc.MvcContext;
-import javax.mvc.locale.LocaleResolver;
-import javax.mvc.locale.LocaleResolverContext;
-import javax.mvc.security.Csrf;
-import javax.mvc.security.Encoders;
-
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.Cookie;
-
-import javax.ws.rs.core.Configuration;
-import javax.ws.rs.core.UriBuilder;
-
/**
* @author Neil Griffin
*/
@@ -63,7 +63,7 @@ public MVCContextImpl(
_csrf = new CsrfImpl(
"p_auth", csrfLiferayPortletURL.getParameter("p_auth"));
- Map cookieMap = new HashMap<>();
+ Map cookieMap = new HashMap<>();
Cookie[] cookies = portletRequest.getCookies();
@@ -71,7 +71,7 @@ public MVCContextImpl(
for (Cookie cookie : cookies) {
cookieMap.put(
cookie.getName(),
- new javax.ws.rs.core.Cookie(
+ new jakarta.ws.rs.core.Cookie(
cookie.getName(), cookie.getValue()));
}
}
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MVCContextProducer.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MVCContextProducer.java
index d1bf75e1c1d325..034cb06dae565a 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MVCContextProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MVCContextProducer.java
@@ -5,20 +5,20 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.annotation.PostConstruct;
+
+import jakarta.mvc.MvcContext;
+import jakarta.mvc.locale.LocaleResolver;
+import jakarta.mvc.security.Encoders;
+
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.PostConstruct;
-
-import javax.mvc.MvcContext;
-import javax.mvc.locale.LocaleResolver;
-import javax.mvc.security.Encoders;
-
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -59,7 +59,7 @@ public void setApplicationContext(ApplicationContext applicationContext) {
private ApplicationContext _applicationContext;
@Autowired
- private javax.ws.rs.core.Configuration _configuration;
+ private jakarta.ws.rs.core.Configuration _configuration;
@Autowired
private Encoders _encoders;
@@ -77,7 +77,7 @@ private static class LocaleResolverPriorityComparator
private LocaleResolverPriorityComparator() {
- // The Javadoc for javax.mvc.locale.LocaleResolver states "If no
+ // The Javadoc for jakarta.mvc.locale.LocaleResolver states "If no
// priority is explicitly defined, the priority is assumed to be
// 1000."
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MessageInterpolatorContextImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MessageInterpolatorContextImpl.java
index 5ca30ac87d6dc7..bc10efd4bce381 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MessageInterpolatorContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MessageInterpolatorContextImpl.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.validation.ConstraintViolation;
-import javax.validation.MessageInterpolator;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.metadata.ConstraintDescriptor;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ModelsImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ModelsImpl.java
index fa678f5ee79c66..8792580cfbf2ea 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ModelsImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ModelsImpl.java
@@ -5,6 +5,10 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.annotation.ManagedBean;
+
+import jakarta.mvc.Models;
+
import java.io.Serializable;
import java.util.Collections;
@@ -13,10 +17,6 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.ManagedBean;
-
-import javax.mvc.Models;
-
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MutableBindingResult.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MutableBindingResult.java
index dbc9ef0e64a4c8..eefc99f70024ca 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MutableBindingResult.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/MutableBindingResult.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.binding.BindingError;
-import javax.mvc.binding.BindingResult;
-import javax.mvc.binding.ValidationError;
+import jakarta.mvc.binding.BindingError;
+import jakarta.mvc.binding.BindingResult;
+import jakarta.mvc.binding.ValidationError;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProviderImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProviderImpl.java
index 1c49ab826b79b1..32d27fe1ae5147 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProviderImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProviderImpl.java
@@ -7,6 +7,13 @@
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.annotation.ManagedBean;
+
+import jakarta.portlet.PortletRequest;
+
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -15,13 +22,6 @@
import java.util.function.Function;
-import javax.annotation.ManagedBean;
-
-import javax.portlet.PortletRequest;
-
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-
import org.springframework.beans.factory.annotation.Autowired;
/**
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProviders.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProviders.java
index 769b245db68728..1f9fa8f0ca290f 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProviders.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProviders.java
@@ -5,13 +5,13 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.inject.Qualifier;
+
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProvidersProducer.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProvidersProducer.java
index 583f0fb1e1499c..70236785af8df0 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProvidersProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamConverterProvidersProducer.java
@@ -5,15 +5,15 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.annotation.PostConstruct;
+
+import jakarta.ws.rs.ext.ParamConverterProvider;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.PostConstruct;
-
-import javax.ws.rs.ext.ParamConverterProvider;
-
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamErrorImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamErrorImpl.java
index b7f1945db69f2c..4c60e8bf2d8a3b 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamErrorImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ParamErrorImpl.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.binding.ParamError;
+import jakarta.mvc.binding.ParamError;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/PortletParamProducer.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/PortletParamProducer.java
index 7c844501696074..959a97caad1803 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/PortletParamProducer.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/PortletParamProducer.java
@@ -12,6 +12,21 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.mvc.binding.BindingResult;
+
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.DefaultValue;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.ext.ParamConverter;
+import jakarta.ws.rs.ext.ParamConverterProvider;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Type;
@@ -21,21 +36,6 @@
import java.util.List;
import java.util.Objects;
-import javax.mvc.binding.BindingResult;
-
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.ext.ParamConverter;
-import javax.ws.rs.ext.ParamConverterProvider;
-
import org.springframework.beans.factory.InjectionPoint;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/RequestImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/RequestImpl.java
index 4cbb56ba85a6f4..e6df40891437ca 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/RequestImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/RequestImpl.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.ws.rs.core.EntityTag;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Variant;
+
import java.util.Date;
import java.util.List;
-import javax.ws.rs.core.EntityTag;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Variant;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ResourceInfoImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ResourceInfoImpl.java
index b12528f744f193..358e4c9960b183 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ResourceInfoImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ResourceInfoImpl.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import java.lang.reflect.Method;
+import jakarta.ws.rs.container.ResourceInfo;
-import javax.ws.rs.container.ResourceInfo;
+import java.lang.reflect.Method;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/UriInfoImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/UriInfoImpl.java
index cec2c1f632c8b9..a8b086c9c4f14a 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/UriInfoImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/UriInfoImpl.java
@@ -5,15 +5,15 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.net.URI;
import java.util.List;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ValidationErrorImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ValidationErrorImpl.java
index e80151e79f396b..8aa1dee7d3fae4 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ValidationErrorImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ValidationErrorImpl.java
@@ -5,9 +5,9 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.binding.ValidationError;
+import jakarta.mvc.binding.ValidationError;
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineContextImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineContextImpl.java
index c9ef9ebcf6b81a..65f6ac420574eb 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineContextImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineContextImpl.java
@@ -5,12 +5,12 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.mvc.Models;
+import jakarta.mvc.Models;
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletRequest;
-import javax.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Configuration;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineContextInjectableImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineContextInjectableImpl.java
index d174809c10eb7f..ed38c578777f42 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineContextInjectableImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineContextInjectableImpl.java
@@ -5,14 +5,14 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.annotation.ManagedBean;
+import jakarta.annotation.ManagedBean;
-import javax.mvc.Models;
+import jakarta.mvc.Models;
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletRequest;
-import javax.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Configuration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineJspImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineJspImpl.java
index 7cc07cff5f5393..82fdb8d5650083 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineJspImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewEngineJspImpl.java
@@ -5,19 +5,19 @@
package com.liferay.bean.portlet.spring.extension.internal.mvc;
-import javax.annotation.ManagedBean;
-import javax.annotation.Priority;
+import jakarta.annotation.ManagedBean;
+import jakarta.annotation.Priority;
-import javax.mvc.engine.ViewEngine;
-import javax.mvc.engine.ViewEngineContext;
-import javax.mvc.engine.ViewEngineException;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.engine.ViewEngineContext;
+import jakarta.mvc.engine.ViewEngineException;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletContext;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletRequestDispatcher;
+import jakarta.portlet.PortletResponse;
-import javax.ws.rs.core.Configuration;
+import jakarta.ws.rs.core.Configuration;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewRendererMVCImpl.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewRendererMVCImpl.java
index d7c8efa339ae21..d1734c0005d5a6 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewRendererMVCImpl.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/mvc/ViewRendererMVCImpl.java
@@ -10,28 +10,28 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.annotation.ManagedBean;
+
+import jakarta.mvc.Models;
+import jakarta.mvc.binding.BindingResult;
+import jakarta.mvc.binding.ParamError;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.engine.ViewEngineException;
+
+import jakarta.portlet.MimeResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletSession;
+
+import jakarta.ws.rs.core.Configuration;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.ManagedBean;
-
-import javax.mvc.Models;
-import javax.mvc.binding.BindingResult;
-import javax.mvc.binding.ParamError;
-import javax.mvc.engine.ViewEngine;
-import javax.mvc.engine.ViewEngineException;
-
-import javax.portlet.MimeResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-
-import javax.ws.rs.core.Configuration;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -175,9 +175,9 @@ private static class ViewEnginePriorityComparator
private ViewEnginePriorityComparator() {
- // The Javadoc for javax.mvc.engine.ViewEngine states "View engines
- // can be decorated with javax.annotation.Priority to indicate their
- // priority; otherwise the priority is assumed to be
+ // The Javadoc for jakarta.mvc.engine.ViewEngine states "View
+ // engines can be decorated with jakarta.annotation.Priority to
+ // indicate their priority; otherwise the priority is assumed to be
// ViewEngine.PRIORITY_APPLICATION."
super(ViewEngine.PRIORITY_APPLICATION);
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringPortletRequestScope.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringPortletRequestScope.java
index e40a783b104458..8af7de583e8b7b 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringPortletRequestScope.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringPortletRequestScope.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import javax.portlet.annotations.PortletRequestScoped;
+import jakarta.portlet.annotations.PortletRequestScoped;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringPortletSessionScope.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringPortletSessionScope.java
index 2ec902ae05c7fe..30a4145975e00f 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringPortletSessionScope.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringPortletSessionScope.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.spring.extension.internal.scope;
-import javax.portlet.annotations.PortletSessionScoped;
+import jakarta.portlet.annotations.PortletSessionScoped;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringRedirectScope.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringRedirectScope.java
index bff250daa60571..fcd389c60811ab 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringRedirectScope.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringRedirectScope.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.spring.extension.internal.scope;
-import javax.mvc.RedirectScoped;
+import jakarta.mvc.RedirectScoped;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringRenderStateScope.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringRenderStateScope.java
index 07a0b020a7d73b..55f78dc297a994 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringRenderStateScope.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringRenderStateScope.java
@@ -5,7 +5,7 @@
package com.liferay.bean.portlet.spring.extension.internal.scope;
-import javax.portlet.annotations.RenderStateScoped;
+import jakarta.portlet.annotations.RenderStateScoped;
/**
* @author Neil Griffin
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringScopedBeanManager.java b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringScopedBeanManager.java
index 5e7e87de1a721e..4e9fbdec9b09a9 100644
--- a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringScopedBeanManager.java
+++ b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/java/com/liferay/bean/portlet/spring/extension/internal/scope/SpringScopedBeanManager.java
@@ -7,24 +7,24 @@
import com.liferay.bean.portlet.extension.ScopedBean;
+import jakarta.mvc.RedirectScoped;
+
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.RenderParameters;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.StateAwareResponse;
+import jakarta.portlet.annotations.PortletSerializable;
+import jakarta.portlet.annotations.RenderStateScoped;
+
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import javax.mvc.RedirectScoped;
-
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderParameters;
-import javax.portlet.RenderResponse;
-import javax.portlet.StateAwareResponse;
-import javax.portlet.annotations.PortletSerializable;
-import javax.portlet.annotations.RenderStateScoped;
-
/**
* @author Neil Griffin
*/
diff --git a/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
similarity index 100%
rename from modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
rename to modules/apps/bean-portlet/bean-portlet-spring-extension/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
diff --git a/modules/apps/blogs/blogs-editor-configuration/build.gradle b/modules/apps/blogs/blogs-editor-configuration/build.gradle
index a344f780edba58..4d22246b40a1da 100644
--- a/modules/apps/blogs/blogs-editor-configuration/build.gradle
+++ b/modules/apps/blogs/blogs-editor-configuration/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:blogs:blogs-api")
compileOnly project(":apps:blogs:blogs-item-selector-api")
diff --git a/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsContentEditorConfigContributor.java b/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsContentEditorConfigContributor.java
index b129317f0b6402..e4d9ea389c56b1 100644
--- a/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsContentEditorConfigContributor.java
+++ b/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsContentEditorConfigContributor.java
@@ -29,12 +29,12 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletURL;
+
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,8 +45,8 @@
configurationPid = "com.liferay.blogs.configuration.BlogsFileUploadsConfiguration",
property = {
"editor.config.key=contentEditor",
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN
},
service = EditorConfigContributor.class
)
diff --git a/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsCoverImageCaptionAlloyEditorConfigContributor.java b/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsCoverImageCaptionAlloyEditorConfigContributor.java
index c51cbaf3ab547b..617961627308e6 100644
--- a/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsCoverImageCaptionAlloyEditorConfigContributor.java
+++ b/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsCoverImageCaptionAlloyEditorConfigContributor.java
@@ -24,8 +24,8 @@
@Component(
property = {
"editor.config.key=coverImageCaptionEditor", "editor.name=alloyeditor",
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN
},
service = EditorConfigContributor.class
)
diff --git a/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsCoverImageCaptionEditorConfigContributor.java b/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsCoverImageCaptionEditorConfigContributor.java
index c9a0b856caa7ab..2b542d37acc002 100644
--- a/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsCoverImageCaptionEditorConfigContributor.java
+++ b/modules/apps/blogs/blogs-editor-configuration/src/main/java/com/liferay/blogs/editor/configuration/internal/BlogsCoverImageCaptionEditorConfigContributor.java
@@ -24,8 +24,8 @@
property = {
"editor.config.key=coverImageCaptionEditor",
"editor.name=ballooneditor",
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN
},
service = EditorConfigContributor.class
)
diff --git a/modules/apps/blogs/blogs-item-selector-web/build.gradle b/modules/apps/blogs/blogs-item-selector-web/build.gradle
index e60639686695e4..f1b8b03e0697e9 100644
--- a/modules/apps/blogs/blogs-item-selector-web/build.gradle
+++ b/modules/apps/blogs/blogs-item-selector-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:blogs:blogs-api")
diff --git a/modules/apps/blogs/blogs-item-selector-web/src/main/java/com/liferay/blogs/item/selector/web/internal/BlogsItemSelectorView.java b/modules/apps/blogs/blogs-item-selector-web/src/main/java/com/liferay/blogs/item/selector/web/internal/BlogsItemSelectorView.java
index 88708493097517..7b339a77e5f84d 100644
--- a/modules/apps/blogs/blogs-item-selector-web/src/main/java/com/liferay/blogs/item/selector/web/internal/BlogsItemSelectorView.java
+++ b/modules/apps/blogs/blogs-item-selector-web/src/main/java/com/liferay/blogs/item/selector/web/internal/BlogsItemSelectorView.java
@@ -18,21 +18,21 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ListUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-item-selector-web/src/main/java/com/liferay/blogs/item/selector/web/internal/display/context/BlogsItemSelectorViewDisplayContext.java b/modules/apps/blogs/blogs-item-selector-web/src/main/java/com/liferay/blogs/item/selector/web/internal/display/context/BlogsItemSelectorViewDisplayContext.java
index 2dee189382202d..75544e66fd5f89 100644
--- a/modules/apps/blogs/blogs-item-selector-web/src/main/java/com/liferay/blogs/item/selector/web/internal/display/context/BlogsItemSelectorViewDisplayContext.java
+++ b/modules/apps/blogs/blogs-item-selector-web/src/main/java/com/liferay/blogs/item/selector/web/internal/display/context/BlogsItemSelectorViewDisplayContext.java
@@ -29,15 +29,15 @@
import com.liferay.portal.kernel.util.OrderByComparator;
import com.liferay.portal.kernel.util.PortletKeys;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.Locale;
import java.util.Set;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Roberto Díaz
*/
diff --git a/modules/apps/blogs/blogs-layout-prototype/build.gradle b/modules/apps/blogs/blogs-layout-prototype/build.gradle
index 606a7c18d9de75..e6cc660dc6d53b 100644
--- a/modules/apps/blogs/blogs-layout-prototype/build.gradle
+++ b/modules/apps/blogs/blogs-layout-prototype/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-tags-navigation-api")
compileOnly project(":apps:blogs:blogs-api")
diff --git a/modules/apps/blogs/blogs-reading-time/build.gradle b/modules/apps/blogs/blogs-reading-time/build.gradle
index bc029fce3eb8b4..26a9caa6814d9b 100644
--- a/modules/apps/blogs/blogs-reading-time/build.gradle
+++ b/modules/apps/blogs/blogs-reading-time/build.gradle
@@ -1,6 +1,6 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:blogs:blogs-api")
compileOnly project(":apps:info:info-api")
diff --git a/modules/apps/blogs/blogs-recent-bloggers-web-test/src/testIntegration/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/portlet/preferences/processor/test/RecentBloggersExportImportPortletPreferencesProcessorTest.java b/modules/apps/blogs/blogs-recent-bloggers-web-test/src/testIntegration/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/portlet/preferences/processor/test/RecentBloggersExportImportPortletPreferencesProcessorTest.java
index 0fbc9c0734af8f..b90316669a51d0 100644
--- a/modules/apps/blogs/blogs-recent-bloggers-web-test/src/testIntegration/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/portlet/preferences/processor/test/RecentBloggersExportImportPortletPreferencesProcessorTest.java
+++ b/modules/apps/blogs/blogs-recent-bloggers-web-test/src/testIntegration/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/portlet/preferences/processor/test/RecentBloggersExportImportPortletPreferencesProcessorTest.java
@@ -26,9 +26,9 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
-import java.util.HashMap;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.HashMap;
import org.junit.Assert;
import org.junit.Before;
@@ -129,7 +129,7 @@ public void testProcessOrganizationId() throws Exception {
}
@Inject(
- filter = "javax.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS
+ filter = "jakarta.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS
)
private ExportImportPortletPreferencesProcessor
_exportImportPortletPreferencesProcessor;
diff --git a/modules/apps/blogs/blogs-recent-bloggers-web/build.gradle b/modules/apps/blogs/blogs-recent-bloggers-web/build.gradle
index 4c2f8b8f29a38a..78c3e7e6cc0a7c 100644
--- a/modules/apps/blogs/blogs-recent-bloggers-web/build.gradle
+++ b/modules/apps/blogs/blogs-recent-bloggers-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:blogs:blogs-api")
compileOnly project(":apps:blogs:blogs-recent-bloggers-api")
diff --git a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/data/handler/RecentBloggersPortletDataHandler.java b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/data/handler/RecentBloggersPortletDataHandler.java
index 2932c4f470b451..8921d15dac853d 100644
--- a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/data/handler/RecentBloggersPortletDataHandler.java
+++ b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/data/handler/RecentBloggersPortletDataHandler.java
@@ -17,7 +17,7 @@
* @author Julio Camarero
*/
@Component(
- property = "javax.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
+ property = "jakarta.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
service = PortletDataHandler.class
)
public class RecentBloggersPortletDataHandler
diff --git a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/portlet/preferences/processor/RecentBloggersExportImportPortletPreferencesProcessor.java b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/portlet/preferences/processor/RecentBloggersExportImportPortletPreferencesProcessor.java
index 18bc96425b6b0b..699179eaa08f3c 100644
--- a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/portlet/preferences/processor/RecentBloggersExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/exportimport/portlet/preferences/processor/RecentBloggersExportImportPortletPreferencesProcessor.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.MapUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletPreferences;
+
import java.util.List;
import java.util.Map;
import java.util.function.Function;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
* @author Máté Thurzó
*/
@Component(
- property = "javax.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
+ property = "jakarta.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
service = ExportImportPortletPreferencesProcessor.class
)
public class RecentBloggersExportImportPortletPreferencesProcessor
diff --git a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/RecentBloggersPortlet.java b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/RecentBloggersPortlet.java
index 6ebce49ae91d58..f5bd4f5f5b5683 100644
--- a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/RecentBloggersPortlet.java
+++ b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/RecentBloggersPortlet.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.model.Release;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,13 +28,13 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Recent Bloggers",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Recent Bloggers",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/action/RecentBloggersConfigurationAction.java b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/action/RecentBloggersConfigurationAction.java
index 78209d71f171c6..55be4cc19d7e80 100644
--- a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/action/RecentBloggersConfigurationAction.java
+++ b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/action/RecentBloggersConfigurationAction.java
@@ -15,11 +15,11 @@
import com.liferay.portal.kernel.portlet.RequestBackedPortletURLFactoryUtil;
import com.liferay.portal.kernel.util.JavaConstants;
-import javax.portlet.PortletConfig;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
+ property = "jakarta.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
service = ConfigurationAction.class
)
public class RecentBloggersConfigurationAction
diff --git a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/action/ViewMVCRenderCommand.java b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/action/ViewMVCRenderCommand.java
index f4eeb169f254bc..4e1c6419e9702a 100644
--- a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/action/ViewMVCRenderCommand.java
+++ b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/java/com/liferay/blogs/recent/bloggers/web/internal/portlet/action/ViewMVCRenderCommand.java
@@ -8,8 +8,8 @@
import com.liferay.blogs.recent.bloggers.constants.RecentBloggersPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -18,7 +18,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
+ "jakarta.portlet.name=" + RecentBloggersPortletKeys.RECENT_BLOGGERS,
"mvc.command.name=/", "mvc.command.name=/recent_bloggers/view"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/resources/META-INF/resources/init.jsp
index ee8acb020a7f9b..44efe9504133e1 100644
--- a/modules/apps/blogs/blogs-recent-bloggers-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/blogs/blogs-recent-bloggers-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/blogs/blogs-service/build.gradle b/modules/apps/blogs/blogs-service/build.gradle
index ca3dcc4598c9cd..ad1a795132a205 100644
--- a/modules/apps/blogs/blogs-service/build.gradle
+++ b/modules/apps/blogs/blogs-service/build.gradle
@@ -4,12 +4,12 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.java", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "net.htmlparser.jericho", name: "jericho-html", version: "3.4"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java b/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java
index 42ae7581d6fac1..dc55abf5691c7a 100644
--- a/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java
+++ b/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/internal/trash/BlogsEntryTrashHandler.java
@@ -24,8 +24,8 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.constants.TrashActionKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/service/impl/BlogsEntryLocalServiceImpl.java b/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/service/impl/BlogsEntryLocalServiceImpl.java
index 625d1af1bc2c28..07341c79ff849a 100644
--- a/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/service/impl/BlogsEntryLocalServiceImpl.java
+++ b/modules/apps/blogs/blogs-service/src/main/java/com/liferay/blogs/service/impl/BlogsEntryLocalServiceImpl.java
@@ -114,6 +114,10 @@
import com.liferay.trash.service.TrashEntryLocalService;
import com.liferay.upload.UniqueFileNameProvider;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
@@ -126,10 +130,6 @@
import java.util.Map;
import java.util.Set;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
import net.htmlparser.jericho.Source;
import net.htmlparser.jericho.StartTag;
diff --git a/modules/apps/blogs/blogs-test/build.gradle b/modules/apps/blogs/blogs-test/build.gradle
index c31abb25a08d41..6caf865ae7b03f 100644
--- a/modules/apps/blogs/blogs-test/build.gradle
+++ b/modules/apps/blogs/blogs-test/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- testIntegrationImplementation group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ testIntegrationImplementation group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
testIntegrationImplementation project(":apps:asset:asset-api")
testIntegrationImplementation project(":apps:asset:asset-auto-tagger-api")
testIntegrationImplementation project(":apps:asset:asset-link-api")
diff --git a/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/internal/exportimport/portlet/preferences/processor/test/BlogsAggregatorExportImportPortletPreferencesProcessorTest.java b/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/internal/exportimport/portlet/preferences/processor/test/BlogsAggregatorExportImportPortletPreferencesProcessorTest.java
index f7f42842fbd8e6..318c4b0a0d9f33 100644
--- a/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/internal/exportimport/portlet/preferences/processor/test/BlogsAggregatorExportImportPortletPreferencesProcessorTest.java
+++ b/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/internal/exportimport/portlet/preferences/processor/test/BlogsAggregatorExportImportPortletPreferencesProcessorTest.java
@@ -43,11 +43,11 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+import jakarta.portlet.PortletPreferences;
+
import java.util.HashMap;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
@@ -234,7 +234,9 @@ private void _setStagingAttribute(
String.valueOf(value));
}
- @Inject(filter = "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR)
+ @Inject(
+ filter = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR
+ )
private ExportImportPortletPreferencesProcessor
_exportImportPortletPreferencesProcessor;
diff --git a/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/item/selector/web/internal/display/context/test/BlogsItemSelectorViewDisplayContextTest.java b/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/item/selector/web/internal/display/context/test/BlogsItemSelectorViewDisplayContextTest.java
index 918ed82d4418c1..3610a1220d3050 100644
--- a/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/item/selector/web/internal/display/context/test/BlogsItemSelectorViewDisplayContextTest.java
+++ b/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/item/selector/web/internal/display/context/test/BlogsItemSelectorViewDisplayContextTest.java
@@ -25,7 +25,7 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/portlet/test/PortletLayoutFinderTest.java b/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/portlet/test/PortletLayoutFinderTest.java
index 9a03c9e05762e1..3934b3623e0cfe 100644
--- a/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/portlet/test/PortletLayoutFinderTest.java
+++ b/modules/apps/blogs/blogs-test/src/testIntegration/java/com/liferay/blogs/portlet/test/PortletLayoutFinderTest.java
@@ -29,7 +29,7 @@
import com.liferay.portal.struts.FindStrutsAction;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.junit.After;
import org.junit.Assert;
diff --git a/modules/apps/blogs/blogs-uad/build.gradle b/modules/apps/blogs/blogs-uad/build.gradle
index 091f1d561469c3..08a0456c5a2323 100644
--- a/modules/apps/blogs/blogs-uad/build.gradle
+++ b/modules/apps/blogs/blogs-uad/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:blogs:blogs-api")
compileOnly project(":apps:user-associated-data:user-associated-data-api")
diff --git a/modules/apps/blogs/blogs-uad/src/main/java/com/liferay/blogs/uad/display/BlogsEntryUADDisplay.java b/modules/apps/blogs/blogs-uad/src/main/java/com/liferay/blogs/uad/display/BlogsEntryUADDisplay.java
index 8cefb6a3811fc1..58aab6924dde4a 100644
--- a/modules/apps/blogs/blogs-uad/src/main/java/com/liferay/blogs/uad/display/BlogsEntryUADDisplay.java
+++ b/modules/apps/blogs/blogs-uad/src/main/java/com/liferay/blogs/uad/display/BlogsEntryUADDisplay.java
@@ -15,7 +15,7 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.user.associated.data.display.UADDisplay;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web-test/build.gradle b/modules/apps/blogs/blogs-web-test/build.gradle
index f507882e730dd8..74e5618a07d428 100644
--- a/modules/apps/blogs/blogs-web-test/build.gradle
+++ b/modules/apps/blogs/blogs-web-test/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- testIntegrationImplementation group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ testIntegrationImplementation group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
testIntegrationImplementation project(":apps:asset:asset-display-page-api")
testIntegrationImplementation project(":apps:blogs:blogs-api")
testIntegrationImplementation project(":apps:friendly-url:friendly-url-api")
diff --git a/modules/apps/blogs/blogs-web-test/src/testIntegration/java/com/liferay/blogs/web/internal/display/context/test/BlogsViewEntryContentDisplayContextTest.java b/modules/apps/blogs/blogs-web-test/src/testIntegration/java/com/liferay/blogs/web/internal/display/context/test/BlogsViewEntryContentDisplayContextTest.java
index 3e531e7e67c0bf..b86045838c05f6 100644
--- a/modules/apps/blogs/blogs-web-test/src/testIntegration/java/com/liferay/blogs/web/internal/display/context/test/BlogsViewEntryContentDisplayContextTest.java
+++ b/modules/apps/blogs/blogs-web-test/src/testIntegration/java/com/liferay/blogs/web/internal/display/context/test/BlogsViewEntryContentDisplayContextTest.java
@@ -51,11 +51,11 @@
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
import com.liferay.portlet.test.MockLiferayPortletContext;
-import javax.portlet.Portlet;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/blogs/blogs-web-test/src/testIntegration/java/com/liferay/blogs/web/internal/portlet/action/test/EditEntryMVCActionCommandTest.java b/modules/apps/blogs/blogs-web-test/src/testIntegration/java/com/liferay/blogs/web/internal/portlet/action/test/EditEntryMVCActionCommandTest.java
index 1211e72eaa7d7c..ee46895204fe5b 100644
--- a/modules/apps/blogs/blogs-web-test/src/testIntegration/java/com/liferay/blogs/web/internal/portlet/action/test/EditEntryMVCActionCommandTest.java
+++ b/modules/apps/blogs/blogs-web-test/src/testIntegration/java/com/liferay/blogs/web/internal/portlet/action/test/EditEntryMVCActionCommandTest.java
@@ -38,13 +38,13 @@
import com.liferay.trash.model.TrashEntry;
import com.liferay.trash.service.TrashEntryLocalService;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/blogs/blogs-web/build.gradle b/modules/apps/blogs/blogs-web/build.gradle
index 6a9406ecf07fd7..de593d01cf0ea4 100644
--- a/modules/apps/blogs/blogs-web/build.gradle
+++ b/modules/apps/blogs/blogs-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/application/list/BlogsPanelApp.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/application/list/BlogsPanelApp.java
index d7fdc2b32b0480..8431edcdad91a4 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/application/list/BlogsPanelApp.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/application/list/BlogsPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/asset/model/BlogsEntryAssetRenderer.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/asset/model/BlogsEntryAssetRenderer.java
index 3ba36f330f0bb2..c83e57a6689cb3 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/asset/model/BlogsEntryAssetRenderer.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/asset/model/BlogsEntryAssetRenderer.java
@@ -38,16 +38,16 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.util.PropsValues;
-import java.util.Locale;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
+import java.util.ResourceBundle;
/**
* @author Jorge Ferrer
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/asset/model/BlogsEntryAssetRendererFactory.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/asset/model/BlogsEntryAssetRendererFactory.java
index 267b6d51c0106a..cf74cd266f7e61 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/asset/model/BlogsEntryAssetRendererFactory.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/asset/model/BlogsEntryAssetRendererFactory.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,7 +44,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = AssetRendererFactory.class
)
public class BlogsEntryAssetRendererFactory
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/change/tracking/spi/display/BlogsEntryCTDisplayRenderer.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/change/tracking/spi/display/BlogsEntryCTDisplayRenderer.java
index 6d7909bebc8b2a..99b8c92c728d72 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/change/tracking/spi/display/BlogsEntryCTDisplayRenderer.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/change/tracking/spi/display/BlogsEntryCTDisplayRenderer.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
+import java.util.ResourceBundle;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/custom/attributes/BlogsEntryCustomAttributesDisplay.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/custom/attributes/BlogsEntryCustomAttributesDisplay.java
index 70679df3624001..468aa96416950b 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/custom/attributes/BlogsEntryCustomAttributesDisplay.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/custom/attributes/BlogsEntryCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Jorge Ferrer
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = CustomAttributesDisplay.class
)
public class BlogsEntryCustomAttributesDisplay
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsAggregatorViewDisplayContext.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsAggregatorViewDisplayContext.java
index ee751d94c17753..cfd2627c3e1103 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsAggregatorViewDisplayContext.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsAggregatorViewDisplayContext.java
@@ -22,18 +22,18 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Mariano Álvaro Sáiz
*/
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsConfigurationDisplayContext.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsConfigurationDisplayContext.java
index e0260bcc770b1d..014aba60d9a342 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsConfigurationDisplayContext.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsConfigurationDisplayContext.java
@@ -21,13 +21,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
/**
* @author Bárbara Cabrera
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsEditEntryDisplayContext.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsEditEntryDisplayContext.java
index 97ddfaf8aae552..0bd58d23d70078 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsEditEntryDisplayContext.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsEditEntryDisplayContext.java
@@ -62,15 +62,15 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.util.PropsValues;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.ResourceBundle;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Adolfo Pérez
*/
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsManagementToolbarDisplayContext.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsManagementToolbarDisplayContext.java
index 0c10e3f89a4922..c9f77be8d714a8 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsManagementToolbarDisplayContext.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsManagementToolbarDisplayContext.java
@@ -32,14 +32,14 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.TrashHelper;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Sergio González
*/
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewDisplayContext.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewDisplayContext.java
index 65dded8daf6dd7..b9fa062b6a5823 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewDisplayContext.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewDisplayContext.java
@@ -26,17 +26,17 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Mariano Álvaro Sáiz
*/
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewEntriesDisplayContext.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewEntriesDisplayContext.java
index 449a32c833f913..1a77833a8485a4 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewEntriesDisplayContext.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewEntriesDisplayContext.java
@@ -50,6 +50,13 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.trash.TrashHelper;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -57,13 +64,6 @@
import java.util.Objects;
import java.util.ResourceBundle;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Sergio González
*/
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewEntryContentDisplayContext.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewEntryContentDisplayContext.java
index fc472bcbd19e73..aa26419ea4019b 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewEntryContentDisplayContext.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewEntryContentDisplayContext.java
@@ -18,7 +18,7 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Roberto Díaz
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewImagesDisplayContext.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewImagesDisplayContext.java
index bd34183330c8a6..6e6d519d19ff01 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewImagesDisplayContext.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/BlogsViewImagesDisplayContext.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Sergio González
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/helper/BlogsPortletInstanceSettingsHelper.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/helper/BlogsPortletInstanceSettingsHelper.java
index 454b3c080506df..dff3f8eeff2893 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/helper/BlogsPortletInstanceSettingsHelper.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/display/context/helper/BlogsPortletInstanceSettingsHelper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Sergio González
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/editor/configuration/BlogsReadingTimeEditorConfigContributor.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/editor/configuration/BlogsReadingTimeEditorConfigContributor.java
index 709b9ab007a68d..8c8a09a7067f2b 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/editor/configuration/BlogsReadingTimeEditorConfigContributor.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/editor/configuration/BlogsReadingTimeEditorConfigContributor.java
@@ -30,8 +30,9 @@
@Component(
property = {
"editor.config.key=contentEditor", "editor.name=alloyeditor",
- "editor.name=ckeditor", "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "editor.name=ckeditor",
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
"service.ranking:Integer=101"
},
service = EditorConfigContributor.class
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsAdminPortletDataHandler.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsAdminPortletDataHandler.java
index a7dcb6e364dd9b..54de9faac3fc57 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsAdminPortletDataHandler.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsAdminPortletDataHandler.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.xml.Element;
import com.liferay.portal.util.PropsValues;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -39,7 +39,7 @@
* @author Gergely Mathe
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
service = PortletDataHandler.class
)
public class BlogsAdminPortletDataHandler extends BasePortletDataHandler {
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsAggregatorPortletDataHandler.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsAggregatorPortletDataHandler.java
index 881e7cdd44ecf8..b5ba5c7d1910ad 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsAggregatorPortletDataHandler.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsAggregatorPortletDataHandler.java
@@ -17,7 +17,7 @@
* @author Julio Camarero
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
service = PortletDataHandler.class
)
public class BlogsAggregatorPortletDataHandler
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsPortletDataHandler.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsPortletDataHandler.java
index 707463af290cf2..522e62605c393e 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsPortletDataHandler.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/data/handler/BlogsPortletDataHandler.java
@@ -17,7 +17,7 @@
import com.liferay.exportimport.kernel.lar.StagedModelType;
import com.liferay.portal.util.PropsValues;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -31,7 +31,7 @@
* @author Gergely Mathe
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = PortletDataHandler.class
)
public class BlogsPortletDataHandler extends BasePortletDataHandler {
@@ -109,7 +109,7 @@ protected void activate() {
}
@Reference(
- target = "(javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN + ")"
)
private PortletDataHandler _blogsAdminPortletDataHandler;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsAggregatorExportImportPortletPreferencesProcessor.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsAggregatorExportImportPortletPreferencesProcessor.java
index 0bb7da71ecbda4..ccaae6a74ecbcf 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsAggregatorExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsAggregatorExportImportPortletPreferencesProcessor.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.util.MapUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletPreferences;
+
import java.util.List;
import java.util.Map;
import java.util.function.Function;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
* @author Máté Thurzó
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
service = ExportImportPortletPreferencesProcessor.class
)
public class BlogsAggregatorExportImportPortletPreferencesProcessor
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsExportImportPortletPreferencesProcessor.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsExportImportPortletPreferencesProcessor.java
index 3026c848e8953c..476e07ef0cc447 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsExportImportPortletPreferencesProcessor.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.xml.Element;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
* @author Máté Thurzó
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = ExportImportPortletPreferencesProcessor.class
)
public class BlogsExportImportPortletPreferencesProcessor
@@ -160,7 +160,7 @@ public PortletPreferences processImportPortletPreferences(
@Reference
private BlogsEntryLocalService _blogsEntryLocalService;
- @Reference(target = "(javax.portlet.name=" + BlogsPortletKeys.BLOGS + ")")
+ @Reference(target = "(jakarta.portlet.name=" + BlogsPortletKeys.BLOGS + ")")
private PortletDataHandler _blogsPortletDataHandler;
@Reference(target = "(name=BlogsExportCapability)")
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsExportImportPortletPreferencesProcessorUtil.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsExportImportPortletPreferencesProcessorUtil.java
index 4b40fd8aaa8f86..2699cd17b6dfae 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsExportImportPortletPreferencesProcessorUtil.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsExportImportPortletPreferencesProcessorUtil.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.template.TemplateHandlerRegistryUtil;
import com.liferay.portal.kernel.util.GetterUtil;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Máté Thurzó
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsPortletDisplayTemplateExportCapability.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsPortletDisplayTemplateExportCapability.java
index 1bea4018ade006..39d30aa403d24f 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsPortletDisplayTemplateExportCapability.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsPortletDisplayTemplateExportCapability.java
@@ -9,7 +9,7 @@
import com.liferay.portlet.display.template.constants.PortletDisplayTemplateConstants;
import com.liferay.portlet.display.template.exportimport.portlet.preferences.processor.PortletDisplayTemplateRegister;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsPortletDisplayTemplateImportCapability.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsPortletDisplayTemplateImportCapability.java
index 9120474b3580b4..ba7910d49077f8 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsPortletDisplayTemplateImportCapability.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/exportimport/portlet/preferences/processor/BlogsPortletDisplayTemplateImportCapability.java
@@ -9,7 +9,7 @@
import com.liferay.portlet.display.template.constants.PortletDisplayTemplateConstants;
import com.liferay.portlet.display.template.exportimport.portlet.preferences.processor.PortletDisplayTemplateRegister;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/frontend/taglib/clay/servlet/taglib/BlogsEntryVerticalCard.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/frontend/taglib/clay/servlet/taglib/BlogsEntryVerticalCard.java
index 9c0b5244d49bc5..298d433aff6c9e 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/frontend/taglib/clay/servlet/taglib/BlogsEntryVerticalCard.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/frontend/taglib/clay/servlet/taglib/BlogsEntryVerticalCard.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.trash.TrashHelper;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.Date;
import java.util.List;
import java.util.ResourceBundle;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author Adolfo Pérez
*/
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/display/url/provider/BlogsAssetInfoEditURLProvider.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/display/url/provider/BlogsAssetInfoEditURLProvider.java
index feb092c87b6d67..a97886bac7cecc 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/display/url/provider/BlogsAssetInfoEditURLProvider.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/display/url/provider/BlogsAssetInfoEditURLProvider.java
@@ -9,7 +9,7 @@
import com.liferay.blogs.model.BlogsEntry;
import com.liferay.info.display.url.provider.InfoEditURLProvider;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/item/renderer/BlogsEntryAbstractInfoItemRenderer.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/item/renderer/BlogsEntryAbstractInfoItemRenderer.java
index 3d5f096a177384..77e940b2ceec99 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/item/renderer/BlogsEntryAbstractInfoItemRenderer.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/item/renderer/BlogsEntryAbstractInfoItemRenderer.java
@@ -12,12 +12,12 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/item/renderer/BlogsEntryFullContentInfoItemRenderer.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/item/renderer/BlogsEntryFullContentInfoItemRenderer.java
index 744debeed0d91c..a833e66b1a3a20 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/item/renderer/BlogsEntryFullContentInfoItemRenderer.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/item/renderer/BlogsEntryFullContentInfoItemRenderer.java
@@ -10,12 +10,12 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/list/renderer/BaseBlogsEntryBasicInfoListRenderer.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/list/renderer/BaseBlogsEntryBasicInfoListRenderer.java
index 75f357cbd03789..87262cde3baff0 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/list/renderer/BaseBlogsEntryBasicInfoListRenderer.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/info/list/renderer/BaseBlogsEntryBasicInfoListRenderer.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/item/selector/BlogsEntryItemSelectorView.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/item/selector/BlogsEntryItemSelectorView.java
index 64613c726725b5..53c99844d2b253 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/item/selector/BlogsEntryItemSelectorView.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/item/selector/BlogsEntryItemSelectorView.java
@@ -33,6 +33,14 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.staging.StagingGroupHelper;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
@@ -41,14 +49,6 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsAddEntryUserNotificationDefinition.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsAddEntryUserNotificationDefinition.java
index 95e7538299a964..080cd5d68301c9 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsAddEntryUserNotificationDefinition.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsAddEntryUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = UserNotificationDefinition.class
)
public class BlogsAddEntryUserNotificationDefinition
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsUpdateEntryUserNotificationDefinition.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsUpdateEntryUserNotificationDefinition.java
index fe0c32c3c41263..6a6d311bc1e833 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsUpdateEntryUserNotificationDefinition.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsUpdateEntryUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = UserNotificationDefinition.class
)
public class BlogsUpdateEntryUserNotificationDefinition
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsUserNotificationHandler.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsUserNotificationHandler.java
index 67ca9df2cc68c4..e3c3ffb5756a47 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsUserNotificationHandler.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/notifications/BlogsUserNotificationHandler.java
@@ -15,7 +15,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = UserNotificationHandler.class
)
public class BlogsUserNotificationHandler
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BaseBlogsPortlet.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BaseBlogsPortlet.java
index 1a8b8546d9551d..af25bf1dde8566 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BaseBlogsPortlet.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BaseBlogsPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
+import jakarta.portlet.ActionRequest;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsAdminPortlet.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsAdminPortlet.java
index 187c9cdaf9f557..7a3c6b293c1699 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsAdminPortlet.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsAdminPortlet.java
@@ -14,12 +14,12 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.util.TrashWebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,14 +41,15 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Blogs", "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.mvc-command-names-default-views=/blogs/view",
- "javax.portlet.init-param.portlet-title-based-navigation=true",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Blogs",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.mvc-command-names-default-views=/blogs/view",
+ "jakarta.portlet.init-param.portlet-title-based-navigation=true",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsAggregatorPortlet.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsAggregatorPortlet.java
index f1a93312e0eaf6..3e5f865db8d725 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsAggregatorPortlet.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsAggregatorPortlet.java
@@ -13,12 +13,12 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.util.TrashWebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,13 +38,13 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Blogs Aggregator",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Blogs Aggregator",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsPortlet.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsPortlet.java
index e26146ce785d7c..ddb5871985be5e 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsPortlet.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsPortlet.java
@@ -17,12 +17,12 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.util.TrashWebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -47,17 +47,18 @@
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.struts-path=blogs",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Blogs", "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.always-display-default-configuration-icons=true",
- "javax.portlet.init-param.always-send-redirect=true",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.supported-public-render-parameter=categoryId",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Blogs",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.always-display-default-configuration-icons=true",
+ "jakarta.portlet.init-param.always-send-redirect=true",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=categoryId",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsViewPortletProvider.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsViewPortletProvider.java
index 8334bc2ee8132c..1354d3bee883dc 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsViewPortletProvider.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/BlogsViewPortletProvider.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ActionUtil.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ActionUtil.java
index cddcb16bb71241..2ad3c289e1ac4d 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ActionUtil.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ActionUtil.java
@@ -16,7 +16,7 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAdminConfigurationAction.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAdminConfigurationAction.java
index 060a614a9acaaa..b069dc81918816 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAdminConfigurationAction.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAdminConfigurationAction.java
@@ -12,11 +12,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
@@ -24,7 +24,7 @@
* @author Iván Zaera
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
service = ConfigurationAction.class
)
public class BlogsAdminConfigurationAction
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAggregatorConfigurationAction.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAggregatorConfigurationAction.java
index a10fa97b63a736..aec7df016bb59c 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAggregatorConfigurationAction.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAggregatorConfigurationAction.java
@@ -10,10 +10,10 @@
import com.liferay.portal.kernel.portlet.ConfigurationAction;
import com.liferay.portal.kernel.portlet.DefaultConfigurationAction;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
service = ConfigurationAction.class
)
public class BlogsAggregatorConfigurationAction
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAggregatorViewMVCRenderCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAggregatorViewMVCRenderCommand.java
index 32080206e7f36f..6ae6d219c30b46 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAggregatorViewMVCRenderCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsAggregatorViewMVCRenderCommand.java
@@ -8,8 +8,8 @@
import com.liferay.blogs.constants.BlogsPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -18,7 +18,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
"mvc.command.name=/", "mvc.command.name=/blogs_aggregator/view"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsConfigurationAction.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsConfigurationAction.java
index da879d1f1c8ec1..ede42c358e55ec 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsConfigurationAction.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/BlogsConfigurationAction.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.portlet.BaseJSPSettingsConfigurationAction;
import com.liferay.portal.kernel.portlet.ConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
@@ -17,7 +17,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = ConfigurationAction.class
)
public class BlogsConfigurationAction
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCActionCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCActionCommand.java
index 2bdf1ac61ff539..b2f7f0d516d9a4 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCActionCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCActionCommand.java
@@ -71,16 +71,16 @@
import com.liferay.trash.service.TrashEntryService;
import com.liferay.upload.AttachmentContentUpdater;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -94,9 +94,9 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
"mvc.command.name=/blogs/edit_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCRenderCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCRenderCommand.java
index 77dde0e72b01be..e4f88ee292dd78 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCRenderCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/EditEntryMVCRenderCommand.java
@@ -27,13 +27,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -47,9 +47,9 @@
@Component(
configurationPid = "com.liferay.blogs.configuration.BlogsFileUploadsConfiguration",
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
"mvc.command.name=/blogs/edit_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/PublishEntryMVCActionCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/PublishEntryMVCActionCommand.java
index 8cc9b358d04e35..1ee0e041d335cb 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/PublishEntryMVCActionCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/PublishEntryMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.servlet.SessionMessages;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,8 +29,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
"mvc.command.name=/blogs/publish_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/TrackbackMVCActionCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/TrackbackMVCActionCommand.java
index fc04fb4e179a2a..1cc936feb4de12 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/TrackbackMVCActionCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/TrackbackMVCActionCommand.java
@@ -29,12 +29,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletPreferences;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,9 +45,9 @@
@Component(
property = {
"auth.token.ignore.mvc.action=true",
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
"mvc.command.name=/blogs/trackback"
},
service = MVCActionCommand.class
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/UploadImageMVCActionCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/UploadImageMVCActionCommand.java
index 796d5b85736376..a79591c6782557 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/UploadImageMVCActionCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/UploadImageMVCActionCommand.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.upload.UploadHandler;
-import java.util.Map;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -35,8 +35,8 @@
@Component(
configurationPid = "com.liferay.blogs.configuration.BlogsFileUploadsConfiguration",
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
"mvc.command.name=/blogs/image_editor",
"mvc.command.name=/blogs/upload_image"
},
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/UploadTempImageMVCActionCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/UploadTempImageMVCActionCommand.java
index 4f8f8a59985525..368f6993619e2e 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/UploadTempImageMVCActionCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/UploadTempImageMVCActionCommand.java
@@ -20,10 +20,10 @@
import com.liferay.upload.UniqueFileNameProvider;
import com.liferay.upload.UploadHandler;
-import java.util.Map;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -36,8 +36,8 @@
@Component(
configurationPid = "com.liferay.blogs.configuration.BlogsFileUploadsConfiguration",
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
"mvc.command.name=/blogs/upload_cover_image",
"mvc.command.name=/blogs/upload_small_image",
"mvc.command.name=/blogs/upload_temp_image"
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewEntryMVCRenderCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewEntryMVCRenderCommand.java
index c314a1087e87e2..88ff74c0283a70 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewEntryMVCRenderCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewEntryMVCRenderCommand.java
@@ -29,14 +29,14 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.util.PropsValues;
-import java.util.Objects;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,9 +46,9 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_AGGREGATOR,
"mvc.command.name=/blogs/view_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewMVCRenderCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewMVCRenderCommand.java
index b27af768e2e0b8..8007c8768080f1 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewMVCRenderCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewMVCRenderCommand.java
@@ -16,10 +16,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.TrashHelper;
-import java.util.Objects;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,8 +29,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
"mvc.command.name=/", "mvc.command.name=/blogs/search",
"mvc.command.name=/blogs/view"
},
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewNotPublishedEntriesMVCRenderCommand.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewNotPublishedEntriesMVCRenderCommand.java
index 8a3ff1ffed7273..a27bdace0ebe72 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewNotPublishedEntriesMVCRenderCommand.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewNotPublishedEntriesMVCRenderCommand.java
@@ -8,8 +8,8 @@
import com.liferay.blogs.constants.BlogsPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -18,7 +18,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
"mvc.command.name=/blogs/view_not_published_entries"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
index 5e1687ada4ac65..5bb0edf77fefeb 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
@@ -22,8 +22,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.security.PermissionsURLTag;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
service = PortletConfigurationIcon.class
)
public class PermissionsPortletConfigurationIcon
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/display/template/BlogsPortletDisplayTemplateHandler.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/display/template/BlogsPortletDisplayTemplateHandler.java
index 8c0610b7267720..2c00eb7360a16e 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/display/template/BlogsPortletDisplayTemplateHandler.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/display/template/BlogsPortletDisplayTemplateHandler.java
@@ -41,7 +41,7 @@
*/
@Component(
configurationPid = "com.liferay.blogs.configuration.BlogsConfiguration",
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = TemplateHandler.class
)
public class BlogsPortletDisplayTemplateHandler
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/route/BlogsFriendlyURLMapper.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/route/BlogsFriendlyURLMapper.java
index dfa7e373e73016..d421aeafe36bf1 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/route/BlogsFriendlyURLMapper.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/portlet/route/BlogsFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + BlogsPortletKeys.BLOGS
+ "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/BlogsEditEntryStatusBarControlMenuJSPDynamicInclude.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/BlogsEditEntryStatusBarControlMenuJSPDynamicInclude.java
index b6e9d5a4686f29..3c4ed5ae17b65a 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/BlogsEditEntryStatusBarControlMenuJSPDynamicInclude.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/BlogsEditEntryStatusBarControlMenuJSPDynamicInclude.java
@@ -13,13 +13,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import java.io.IOException;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/BlogsPortletHeaderJSPDynamicInclude.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/BlogsPortletHeaderJSPDynamicInclude.java
index 24ec91c09e5ba7..f599544eda0233 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/BlogsPortletHeaderJSPDynamicInclude.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/BlogsPortletHeaderJSPDynamicInclude.java
@@ -14,13 +14,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.io.IOException;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/util/BlogsEntryActionDropdownItemsProvider.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/util/BlogsEntryActionDropdownItemsProvider.java
index d984aaa853389c..ff53f21bd785e0 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/util/BlogsEntryActionDropdownItemsProvider.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/servlet/taglib/util/BlogsEntryActionDropdownItemsProvider.java
@@ -40,16 +40,16 @@
import com.liferay.taglib.security.PermissionsURLTag;
import com.liferay.trash.TrashHelper;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
import java.util.ResourceBundle;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Adolfo Pérez
*/
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/sharing/BlogsEntrySharingUtil.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/sharing/BlogsEntrySharingUtil.java
index 06ecf017859188..733c189e3b5e54 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/sharing/BlogsEntrySharingUtil.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/sharing/BlogsEntrySharingUtil.java
@@ -21,7 +21,7 @@
import com.liferay.sharing.security.permission.SharingPermission;
import com.liferay.sharing.service.SharingEntryLocalService;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/social/BlogsActivityInterpreter.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/social/BlogsActivityInterpreter.java
index fa028bfa2196c4..8c9460cf91ca50 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/social/BlogsActivityInterpreter.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/social/BlogsActivityInterpreter.java
@@ -32,7 +32,7 @@
* @author Zsolt Berentey
*/
@Component(
- property = "javax.portlet.name=" + BlogsPortletKeys.BLOGS,
+ property = "jakarta.portlet.name=" + BlogsPortletKeys.BLOGS,
service = SocialActivityInterpreter.class
)
public class BlogsActivityInterpreter extends BaseSocialActivityInterpreter {
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/struts/FindEntryStrutsAction.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/struts/FindEntryStrutsAction.java
index 9691f1ba82418c..26278ec5e940bf 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/struts/FindEntryStrutsAction.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/struts/FindEntryStrutsAction.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.struts.FindStrutsAction;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/struts/RSSStrutsAction.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/struts/RSSStrutsAction.java
index 3ddf30c1204da8..f27158da0e4ef8 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/struts/RSSStrutsAction.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/struts/RSSStrutsAction.java
@@ -28,13 +28,13 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.rss.util.RSSUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.nio.charset.StandardCharsets;
import java.util.Date;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
index 3e1cffbe20e31b..52c745ebfe9b1a 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
import com.liferay.portal.kernel.upgrade.BasePortletPreferencesUpgradeProcess;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Iván Zaera
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_1_0/UpgradePortletPreferences.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_1_0/UpgradePortletPreferences.java
index e1daeb43ab1621..8642d1a21c5b48 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_1_0/UpgradePortletPreferences.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_1_0/UpgradePortletPreferences.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
import com.liferay.portal.kernel.upgrade.BasePortletPreferencesUpgradeProcess;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Sergio González
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_2_0/UpgradePortletPreferences.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_2_0/UpgradePortletPreferences.java
index 0561a63a8e18fb..6221f0e6bfcf35 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_2_0/UpgradePortletPreferences.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upgrade/v1_2_0/UpgradePortletPreferences.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
import com.liferay.portal.kernel.upgrade.BasePortletPreferencesUpgradeProcess;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upload/ImageBlogsUploadResponseHandler.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upload/ImageBlogsUploadResponseHandler.java
index 305c827001ea84..735fa9051ae63e 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upload/ImageBlogsUploadResponseHandler.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/upload/ImageBlogsUploadResponseHandler.java
@@ -19,7 +19,7 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.upload.UploadResponseHandler;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Roberto Díaz
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsEntryAssetEntryUtil.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsEntryAssetEntryUtil.java
index 892a4ec21ccadf..e96a0a8edbbd41 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsEntryAssetEntryUtil.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsEntryAssetEntryUtil.java
@@ -13,7 +13,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.module.service.Snapshot;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsPortletInstanceConfigurationUtil.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsPortletInstanceConfigurationUtil.java
index cff7707a4a88b5..56a0a2d77707be 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsPortletInstanceConfigurationUtil.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsPortletInstanceConfigurationUtil.java
@@ -13,7 +13,7 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsUtil.java b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsUtil.java
index a04a205c2a63c4..985441a456471f 100644
--- a/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsUtil.java
+++ b/modules/apps/blogs/blogs-web/src/main/java/com/liferay/blogs/web/internal/util/BlogsUtil.java
@@ -28,11 +28,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletRequest;
-
/**
* @author Brian Wing Shun Chan
* @author Thiago Moreira
diff --git a/modules/apps/blogs/blogs-web/src/main/resources/META-INF/friendly-url-routes/routes.xml b/modules/apps/blogs/blogs-web/src/main/resources/META-INF/friendly-url-routes/routes.xml
index c10a433bb73593..8e51f3c7659b5b 100644
--- a/modules/apps/blogs/blogs-web/src/main/resources/META-INF/friendly-url-routes/routes.xml
+++ b/modules/apps/blogs/blogs-web/src/main/resources/META-INF/friendly-url-routes/routes.xml
@@ -38,13 +38,13 @@
/trackback/{entryId:\d+}
- /blogs/trackback
+ /blogs/trackback
1
exclusive
/trackback/{urlTitle}
- /blogs/trackback
+ /blogs/trackback
1
exclusive
@@ -64,12 +64,12 @@
/trackback/{entryId:\d+}/{p_p_state}
- /blogs/trackback
+ /blogs/trackback
1
/trackback/{urlTitle}/{p_p_state}
- /blogs/trackback
+ /blogs/trackback
1
\ No newline at end of file
diff --git a/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/blogs/info/item/renderer/init.jsp b/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/blogs/info/item/renderer/init.jsp
index 280015526db78f..b2f9f1b6fd2825 100644
--- a/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/blogs/info/item/renderer/init.jsp
+++ b/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/blogs/info/item/renderer/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/dynamic_include/init.jsp b/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/dynamic_include/init.jsp
index 201671b3c0e209..d17f1daadac22b 100644
--- a/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/dynamic_include/init.jsp
+++ b/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/dynamic_include/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -40,7 +40,7 @@ page import="com.liferay.portal.kernel.util.PortalUtil" %><%@
page import="com.liferay.rss.util.RSSUtil" %><%@
page import="com.liferay.subscription.service.SubscriptionLocalServiceUtil" %>
-<%@ page import="javax.portlet.PortletRequest" %>
+<%@ page import="jakarta.portlet.PortletRequest" %>
diff --git a/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/init.jsp
index 7491e6166daaab..849040a2a73b10 100644
--- a/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/blogs/blogs-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -129,6 +129,10 @@ page import="com.liferay.ratings.kernel.service.RatingsEntryLocalServiceUtil" %>
page import="com.liferay.ratings.kernel.service.RatingsStatsLocalServiceUtil" %><%@
page import="com.liferay.rss.util.RSSUtil" %>
+<%@ page import="jakarta.portlet.PortletRequest" %><%@
+page import="jakarta.portlet.PortletURL" %><%@
+page import="jakarta.portlet.WindowState" %>
+
<%@ page import="java.text.Format" %>
<%@ page import="java.util.ArrayList" %><%@
@@ -138,10 +142,6 @@ page import="java.util.List" %><%@
page import="java.util.Map" %><%@
page import="java.util.Objects" %>
-<%@ page import="javax.portlet.PortletRequest" %><%@
-page import="javax.portlet.PortletURL" %><%@
-page import="javax.portlet.WindowState" %>
-
diff --git a/modules/apps/blogs/blogs-web/src/test/java/com/liferay/blogs/web/internal/portlet/action/TrackbackMVCActionCommandTest.java b/modules/apps/blogs/blogs-web/src/test/java/com/liferay/blogs/web/internal/portlet/action/TrackbackMVCActionCommandTest.java
index b2fdc0a0b37b08..2d552c06c37792 100644
--- a/modules/apps/blogs/blogs-web/src/test/java/com/liferay/blogs/web/internal/portlet/action/TrackbackMVCActionCommandTest.java
+++ b/modules/apps/blogs/blogs-web/src/test/java/com/liferay/blogs/web/internal/portlet/action/TrackbackMVCActionCommandTest.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.test.rule.LiferayUnitTestRule;
-import java.util.Collections;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
+import java.util.Collections;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/bookmarks/bookmarks-api/build.gradle b/modules/apps/bookmarks/bookmarks-api/build.gradle
index de072bcbb2b840..d2a8221c9435b7 100644
--- a/modules/apps/bookmarks/bookmarks-api/build.gradle
+++ b/modules/apps/bookmarks/bookmarks-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:static:portal-configuration:portal-configuration-metatype-api")
diff --git a/modules/apps/bookmarks/bookmarks-service/build.gradle b/modules/apps/bookmarks/bookmarks-service/build.gradle
index 3f6f2ff3ce3b57..92370308ffb844 100644
--- a/modules/apps/bookmarks/bookmarks-service/build.gradle
+++ b/modules/apps/bookmarks/bookmarks-service/build.gradle
@@ -4,11 +4,11 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.java", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/data/handler/BookmarksAdminPortletDataHandler.java b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/data/handler/BookmarksAdminPortletDataHandler.java
index d7b76b89183eb8..3fde28fcb50e07 100644
--- a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/data/handler/BookmarksAdminPortletDataHandler.java
+++ b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/data/handler/BookmarksAdminPortletDataHandler.java
@@ -24,9 +24,9 @@
import com.liferay.portal.kernel.module.framework.ModuleServiceLifecycle;
import com.liferay.portal.kernel.xml.Element;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -42,7 +42,7 @@
* @author Gergely Mathe
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
service = PortletDataHandler.class
)
public class BookmarksAdminPortletDataHandler extends BasePortletDataHandler {
diff --git a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/data/handler/BookmarksPortletDataHandler.java b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/data/handler/BookmarksPortletDataHandler.java
index e5131ad1fe9e1b..52bc5ba7589dfb 100644
--- a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/data/handler/BookmarksPortletDataHandler.java
+++ b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/data/handler/BookmarksPortletDataHandler.java
@@ -17,7 +17,7 @@
import com.liferay.exportimport.kernel.lar.StagedModelType;
import com.liferay.portal.kernel.module.framework.ModuleServiceLifecycle;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -33,7 +33,7 @@
* @author Gergely Mathe
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = PortletDataHandler.class
)
public class BookmarksPortletDataHandler extends BasePortletDataHandler {
@@ -117,7 +117,7 @@ protected void activate() {
}
@Reference(
- target = "(javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN + ")"
)
private PortletDataHandler _bookmarksAdminPortletDataHandler;
diff --git a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/portlet/preferences/processor/BookmarksExportImportPortletPreferencesProcessor.java b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/portlet/preferences/processor/BookmarksExportImportPortletPreferencesProcessor.java
index 8418faa4c5a17a..5c9d09df40b682 100644
--- a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/portlet/preferences/processor/BookmarksExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/exportimport/portlet/preferences/processor/BookmarksExportImportPortletPreferencesProcessor.java
@@ -29,12 +29,12 @@
import com.liferay.portal.kernel.util.MapUtil;
import com.liferay.portal.kernel.xml.Element;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.ReadOnlyException;
+
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-import javax.portlet.ReadOnlyException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,7 +42,7 @@
* @author Máté Thurzó
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = ExportImportPortletPreferencesProcessor.class
)
public class BookmarksExportImportPortletPreferencesProcessor
@@ -249,7 +249,7 @@ public PortletPreferences processImportPortletPreferences(
_bookmarksFolderStagedModelRepository;
@Reference(
- target = "(javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS + ")"
+ target = "(jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS + ")"
)
private PortletDataHandler _bookmarksPortletDataHandler;
diff --git a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/social/BookmarksEntryActivityInterpreter.java b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/social/BookmarksEntryActivityInterpreter.java
index 81f2e9ae5e6de5..0c5a237c5c1053 100644
--- a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/social/BookmarksEntryActivityInterpreter.java
+++ b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/social/BookmarksEntryActivityInterpreter.java
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
"model.class.name=com.liferay.bookmarks.model.BookmarksEntry"
},
service = SocialActivityInterpreter.class
diff --git a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/social/BookmarksFolderActivityInterpreter.java b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/social/BookmarksFolderActivityInterpreter.java
index b75e5c4233f848..c4ad22da3e2537 100644
--- a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/social/BookmarksFolderActivityInterpreter.java
+++ b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/internal/social/BookmarksFolderActivityInterpreter.java
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
"model.class.name=com.liferay.bookmarks.model.BookmarksFolder"
},
service = SocialActivityInterpreter.class
diff --git a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/service/impl/BookmarksEntryLocalServiceImpl.java b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/service/impl/BookmarksEntryLocalServiceImpl.java
index d5fd1ae7ff6361..5f06960a7807f4 100644
--- a/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/service/impl/BookmarksEntryLocalServiceImpl.java
+++ b/modules/apps/bookmarks/bookmarks-service/src/main/java/com/liferay/bookmarks/service/impl/BookmarksEntryLocalServiceImpl.java
@@ -78,12 +78,12 @@
import com.liferay.trash.service.TrashEntryLocalService;
import com.liferay.trash.service.TrashVersionLocalService;
-import java.util.Date;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bookmarks/bookmarks-uad/build.gradle b/modules/apps/bookmarks/bookmarks-uad/build.gradle
index aee5317f8a5550..1b96a4785a6d7d 100644
--- a/modules/apps/bookmarks/bookmarks-uad/build.gradle
+++ b/modules/apps/bookmarks/bookmarks-uad/build.gradle
@@ -1,6 +1,6 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:bookmarks:bookmarks-api")
compileOnly project(":apps:export-import:export-import-api")
diff --git a/modules/apps/bookmarks/bookmarks-web/build.gradle b/modules/apps/bookmarks/bookmarks-web/build.gradle
index 4b07d6f06fff00..0ee60c44b3a5a3 100644
--- a/modules/apps/bookmarks/bookmarks-web/build.gradle
+++ b/modules/apps/bookmarks/bookmarks-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.java", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:asset:asset-taglib")
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/application/list/BookmarksPanelApp.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/application/list/BookmarksPanelApp.java
index 6dd24d3afdb36c..1e1d4eaf226bc4 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/application/list/BookmarksPanelApp.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/application/list/BookmarksPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksEntryAssetRenderer.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksEntryAssetRenderer.java
index bbc376cf441ebf..99035242431a27 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksEntryAssetRenderer.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksEntryAssetRenderer.java
@@ -26,15 +26,15 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Julio Camarero
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksEntryAssetRendererFactory.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksEntryAssetRendererFactory.java
index f2978072ef0f5b..27a4c45a5cf8d6 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksEntryAssetRendererFactory.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksEntryAssetRendererFactory.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -43,7 +43,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = AssetRendererFactory.class
)
public class BookmarksEntryAssetRendererFactory
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksFolderAssetRenderer.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksFolderAssetRenderer.java
index 03208283d66d60..b088147e8f54e1 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksFolderAssetRenderer.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksFolderAssetRenderer.java
@@ -25,15 +25,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.TrashHelper;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksFolderAssetRendererFactory.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksFolderAssetRendererFactory.java
index de6be67d3dfcb4..d2f5b18259ebc8 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksFolderAssetRendererFactory.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksFolderAssetRendererFactory.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.service.GroupLocalService;
import com.liferay.trash.TrashHelper;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
* @author Alexander Chow
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = AssetRendererFactory.class
)
public class BookmarksFolderAssetRendererFactory
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksRootFolderAssetRenderer.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksRootFolderAssetRenderer.java
index 4c0026f558a74d..935862bf9f2894 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksRootFolderAssetRenderer.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/asset/model/BookmarksRootFolderAssetRenderer.java
@@ -12,12 +12,12 @@
import com.liferay.portal.kernel.model.Group;
import com.liferay.portal.kernel.trash.TrashRenderer;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Alejandro Tardín*
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/change/tracking/spi/display/BookmarksEntryCTDisplayRenderer.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/change/tracking/spi/display/BookmarksEntryCTDisplayRenderer.java
index 7b922a910db167..2d8ddec72f331e 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/change/tracking/spi/display/BookmarksEntryCTDisplayRenderer.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/change/tracking/spi/display/BookmarksEntryCTDisplayRenderer.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/change/tracking/spi/display/BookmarksFolderCTDisplayRenderer.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/change/tracking/spi/display/BookmarksFolderCTDisplayRenderer.java
index 0dd404904baeac..d4fd04753f9747 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/change/tracking/spi/display/BookmarksFolderCTDisplayRenderer.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/change/tracking/spi/display/BookmarksFolderCTDisplayRenderer.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/custom/attributes/BookmarksEntryCustomAttributesDisplay.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/custom/attributes/BookmarksEntryCustomAttributesDisplay.java
index 9e88905547e972..b42862a2e444b8 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/custom/attributes/BookmarksEntryCustomAttributesDisplay.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/custom/attributes/BookmarksEntryCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Jorge Ferrer
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = CustomAttributesDisplay.class
)
public class BookmarksEntryCustomAttributesDisplay
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/custom/attributes/BookmarksFolderCustomAttributesDisplay.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/custom/attributes/BookmarksFolderCustomAttributesDisplay.java
index f40b1db6eb15d8..8bcedea0e42906 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/custom/attributes/BookmarksFolderCustomAttributesDisplay.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/custom/attributes/BookmarksFolderCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Jorge Ferrer
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = CustomAttributesDisplay.class
)
public class BookmarksFolderCustomAttributesDisplay
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksConfigurationDisplayContext.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksConfigurationDisplayContext.java
index 9d3b3665610b81..c5451af922bd45 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksConfigurationDisplayContext.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksConfigurationDisplayContext.java
@@ -20,13 +20,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
/**
* @author Bárbara Cabrera
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksDisplayContext.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksDisplayContext.java
index 1bdcae8228db50..13981d1314aca7 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksDisplayContext.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksDisplayContext.java
@@ -30,12 +30,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.util.ArrayList;
-import java.util.Objects;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Objects;
/**
* @author Mariano Álvaro Sáiz
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksManagementToolbarDisplayContext.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksManagementToolbarDisplayContext.java
index 13901c1625b3bf..d7703160012980 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksManagementToolbarDisplayContext.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/display/context/BookmarksManagementToolbarDisplayContext.java
@@ -38,12 +38,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.TrashHelper;
-import java.util.List;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletException;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksAddEntryUserNotificationDefinition.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksAddEntryUserNotificationDefinition.java
index 1fbb80dc0732c9..a585d922c03a35 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksAddEntryUserNotificationDefinition.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksAddEntryUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = UserNotificationDefinition.class
)
public class BookmarksAddEntryUserNotificationDefinition
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksUpdateEntryUserNotificationDefinition.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksUpdateEntryUserNotificationDefinition.java
index c583954915d2f3..d893a9da16c044 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksUpdateEntryUserNotificationDefinition.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksUpdateEntryUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = UserNotificationDefinition.class
)
public class BookmarksUpdateEntryUserNotificationDefinition
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksUserNotificationHandler.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksUserNotificationHandler.java
index f3af14fa18d423..13f766c890d607 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksUserNotificationHandler.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/notifications/BookmarksUserNotificationHandler.java
@@ -15,7 +15,7 @@
* @author Roberto Díaz
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
service = UserNotificationHandler.class
)
public class BookmarksUserNotificationHandler
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/BookmarksAdminPortlet.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/BookmarksAdminPortlet.java
index e835c9a4af97ad..9884c7441db7ab 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/BookmarksAdminPortlet.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/BookmarksAdminPortlet.java
@@ -11,12 +11,12 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.util.TrashWebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,16 +36,16 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.struts-path=bookmarks_admin",
- "javax.portlet.display-name=Bookmarks Admin",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.always-send-redirect=true",
- "javax.portlet.init-param.mvc-command-names-default-views=/bookmarks/view",
- "javax.portlet.init-param.portlet-title-based-navigation=true",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Bookmarks Admin",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.always-send-redirect=true",
+ "jakarta.portlet.init-param.mvc-command-names-default-views=/bookmarks/view",
+ "jakarta.portlet.init-param.portlet-title-based-navigation=true",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/BookmarksPortlet.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/BookmarksPortlet.java
index dcaba1b9aee18f..ed3e16c74661fb 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/BookmarksPortlet.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/BookmarksPortlet.java
@@ -11,12 +11,12 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.util.TrashWebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,19 +37,19 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.struts-path=bookmarks",
- "javax.portlet.display-name=Bookmarks",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.always-display-default-configuration-icons=true",
- "javax.portlet.init-param.mvc-command-names-default-views=/bookmarks/view",
- "javax.portlet.init-param.portlet-title-based-navigation=false",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.supported-public-render-parameter=categoryId",
- "javax.portlet.supported-public-render-parameter=resetCur",
- "javax.portlet.supported-public-render-parameter=tag",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Bookmarks",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.always-display-default-configuration-icons=true",
+ "jakarta.portlet.init-param.mvc-command-names-default-views=/bookmarks/view",
+ "jakarta.portlet.init-param.portlet-title-based-navigation=false",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=categoryId",
+ "jakarta.portlet.supported-public-render-parameter=resetCur",
+ "jakarta.portlet.supported-public-render-parameter=tag",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/ActionUtil.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/ActionUtil.java
index bfcf185765ea53..b0318444e39f72 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/ActionUtil.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/ActionUtil.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BaseEntryMVCRenderCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BaseEntryMVCRenderCommand.java
index 6ada9c2c2e7cfd..865a74ccc8c971 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BaseEntryMVCRenderCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BaseEntryMVCRenderCommand.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
/**
* @author Iván Zaera
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BaseFolderMVCRenderCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BaseFolderMVCRenderCommand.java
index e48dbc88ad484f..9ed6917ecb0123 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BaseFolderMVCRenderCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BaseFolderMVCRenderCommand.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
/**
* @author Iván Zaera
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BookmarksAdminConfigurationAction.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BookmarksAdminConfigurationAction.java
index cb1959ebeacdcb..687c7810538131 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BookmarksAdminConfigurationAction.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/BookmarksAdminConfigurationAction.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.GetterUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
service = ConfigurationAction.class
)
public class BookmarksAdminConfigurationAction
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCActionCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCActionCommand.java
index edd01236082f3e..ae09b22e999090 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCActionCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCActionCommand.java
@@ -34,12 +34,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.service.TrashEntryService;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,8 +49,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/bookmarks/edit_entry",
"mvc.command.name=/bookmarks/move_entry"
},
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCRenderCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCRenderCommand.java
index 5e1d03b165cf45..a95147031896c0 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCRenderCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditEntryMVCRenderCommand.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,8 +28,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/bookmarks/edit_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCActionCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCActionCommand.java
index 055a3fa0119c91..783fd9eabb6495 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCActionCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCActionCommand.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.service.TrashEntryService;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,8 +41,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/bookmarks/edit_folder"
},
service = MVCActionCommand.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCRenderCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCRenderCommand.java
index 9bf6b32bf4f463..bf034a0a2a5f1b 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCRenderCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/EditFolderMVCRenderCommand.java
@@ -21,8 +21,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/bookmarks/edit_folder"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/InfoPanelMVCResourceCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/InfoPanelMVCResourceCommand.java
index 1b7ee54d87ba9a..80999bf01e8efc 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/InfoPanelMVCResourceCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/InfoPanelMVCResourceCommand.java
@@ -12,8 +12,8 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.util.TrashWebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,8 +23,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/bookmarks/info_panel"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/MoveEntryMVCRenderCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/MoveEntryMVCRenderCommand.java
index 908b1980ef2044..45f015f970ca6c 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/MoveEntryMVCRenderCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/MoveEntryMVCRenderCommand.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.security.auth.PrincipalException;
import com.liferay.portal.kernel.servlet.SessionErrors;
-import java.util.List;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
@@ -27,8 +27,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/bookmarks/move_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/PublishFolderMVCActionCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/PublishFolderMVCActionCommand.java
index 6b6cd8a1376269..962914e75a8077 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/PublishFolderMVCActionCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/PublishFolderMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/bookmarks/publish_folder"
},
service = MVCActionCommand.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/SelectFolderMVCRenderCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/SelectFolderMVCRenderCommand.java
index 9306b4c6b56cf3..dd85c01797bd44 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/SelectFolderMVCRenderCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/SelectFolderMVCRenderCommand.java
@@ -15,8 +15,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/bookmarks/select_folder"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/ViewMVCRenderCommand.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/ViewMVCRenderCommand.java
index 4b36d333657693..ac46b293668bdb 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/ViewMVCRenderCommand.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/action/ViewMVCRenderCommand.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.security.auth.PrincipalException;
import com.liferay.portal.kernel.servlet.SessionErrors;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,8 +28,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"mvc.command.name=/", "mvc.command.name=/bookmarks/view",
"mvc.command.name=/bookmarks/view_folder"
},
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/DeleteFolderPortletConfigurationIcon.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/DeleteFolderPortletConfigurationIcon.java
index 976550999794cb..e638a6a6026d98 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/DeleteFolderPortletConfigurationIcon.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/DeleteFolderPortletConfigurationIcon.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.trash.TrashHelper;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"path=/bookmarks/view_folder"
},
service = PortletConfigurationIcon.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/EditFolderPortletConfigurationIcon.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/EditFolderPortletConfigurationIcon.java
index 8069422c88c213..da17a46c9e3f89 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/EditFolderPortletConfigurationIcon.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/EditFolderPortletConfigurationIcon.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"path=/bookmarks/view_folder"
},
service = PortletConfigurationIcon.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/FolderPermissionsPortletConfigurationIcon.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/FolderPermissionsPortletConfigurationIcon.java
index 0eebc6938ef460..ff66f8e0086235 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/FolderPermissionsPortletConfigurationIcon.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/FolderPermissionsPortletConfigurationIcon.java
@@ -23,8 +23,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.security.PermissionsURLTag;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"path=/bookmarks/view_folder"
},
service = PortletConfigurationIcon.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/MoveFolderPortletConfigurationIcon.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/MoveFolderPortletConfigurationIcon.java
index 7a9d9cb656268a..30de913537dbc4 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/MoveFolderPortletConfigurationIcon.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/MoveFolderPortletConfigurationIcon.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
"path=/bookmarks/view_folder"
},
service = PortletConfigurationIcon.class
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
index d68bd3aebfc36e..ac24bb5235ee98 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
@@ -22,8 +22,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.security.PermissionsURLTag;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
+ property = "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS_ADMIN,
service = PortletConfigurationIcon.class
)
public class PermissionsPortletConfigurationIcon
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/route/BookmarksFriendlyURLMapper.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/route/BookmarksFriendlyURLMapper.java
index 57661d76bd0ae1..838a54e6898a89 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/route/BookmarksFriendlyURLMapper.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/route/BookmarksFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/toolbar/contributor/BookmarksPortletToolbarContributor.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/toolbar/contributor/BookmarksPortletToolbarContributor.java
index fb87dfcd0829b3..dd02ff6450638a 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/toolbar/contributor/BookmarksPortletToolbarContributor.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/toolbar/contributor/BookmarksPortletToolbarContributor.java
@@ -36,12 +36,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
+ "jakarta.portlet.name=" + BookmarksPortletKeys.BOOKMARKS,
"mvc.render.command.name=-", "mvc.render.command.name=/bookmarks/view",
"mvc.render.command.name=/bookmarks/view_folder"
},
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/util/BookmarksUtil.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/util/BookmarksUtil.java
index 7a2c5e87d07a9b..d3a6b160ff8506 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/util/BookmarksUtil.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/portlet/util/BookmarksUtil.java
@@ -33,17 +33,17 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/search/EntriesChecker.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/search/EntriesChecker.java
index 9a388a3d6fb0ac..d4599dd9d8e8a8 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/search/EntriesChecker.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/search/EntriesChecker.java
@@ -23,7 +23,7 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Sergio González
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/FindEntryStrutsAction.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/FindEntryStrutsAction.java
index a635b056490f28..e60af9833a05bb 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/FindEntryStrutsAction.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/FindEntryStrutsAction.java
@@ -10,8 +10,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/FindFolderStrutsAction.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/FindFolderStrutsAction.java
index 9af08d21cb527d..c3a8edcd8ea944 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/FindFolderStrutsAction.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/FindFolderStrutsAction.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.struts.StrutsAction;
import com.liferay.portal.struts.FindStrutsAction;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/OpenEntryStrutsAction.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/OpenEntryStrutsAction.java
index a949ef53ec6f97..f76f08ef08ebc1 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/OpenEntryStrutsAction.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/struts/OpenEntryStrutsAction.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java
index c1c9a52ff68052..e9ba8961424000 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksEntryTrashHandler.java
@@ -23,7 +23,7 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.constants.TrashActionKeys;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java
index e04164641ba8c2..29647b42cf1ce8 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/trash/BookmarksFolderTrashHandler.java
@@ -23,7 +23,7 @@
import com.liferay.trash.TrashHelper;
import com.liferay.trash.constants.TrashActionKeys;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
index e5704875e8d334..cf0c331acb7088 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/upgrade/v1_0_0/UpgradePortletPreferences.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
import com.liferay.portal.kernel.upgrade.BasePortletPreferencesUpgradeProcess;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
/**
* @author Iván Zaera
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/util/BookmarksUtil.java b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/util/BookmarksUtil.java
index a48e3f137c17be..c8e26b8bc4d456 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/util/BookmarksUtil.java
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/java/com/liferay/bookmarks/web/internal/util/BookmarksUtil.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.Collections;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author Brian Wing Shun Chan
*/
diff --git a/modules/apps/bookmarks/bookmarks-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/bookmarks/bookmarks-web/src/main/resources/META-INF/resources/init.jsp
index 98fdc569c0db41..c856d3024abd55 100644
--- a/modules/apps/bookmarks/bookmarks-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/bookmarks/bookmarks-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -89,6 +89,8 @@ page import="com.liferay.staging.StagingGroupHelper" %><%@
page import="com.liferay.staging.StagingGroupHelperUtil" %><%@
page import="com.liferay.subscription.service.SubscriptionLocalServiceUtil" %>
+<%@ page import="jakarta.portlet.PortletRequest" %>
+
<%@ page import="java.text.Format" %>
<%@ page import="java.util.ArrayList" %><%@
@@ -98,8 +100,6 @@ page import="java.util.Map" %><%@
page import="java.util.Objects" %><%@
page import="java.util.Set" %>
-<%@ page import="javax.portlet.PortletRequest" %>
-
diff --git a/modules/apps/bulk/bulk-rest-api/bnd.bnd b/modules/apps/bulk/bulk-rest-api/bnd.bnd
index 2dd042517ee74d..d9c5ce0d792c40 100644
--- a/modules/apps/bulk/bulk-rest-api/bnd.bnd
+++ b/modules/apps/bulk/bulk-rest-api/bnd.bnd
@@ -1,6 +1,6 @@
Bundle-Name: Liferay Bulk REST API
Bundle-SymbolicName: com.liferay.bulk.rest.api
-Bundle-Version: 6.1.7
+Bundle-Version: 7.0.0
Export-Package:\
com.liferay.bulk.rest.dto.v1_0,\
com.liferay.bulk.rest.resource.v1_0
\ No newline at end of file
diff --git a/modules/apps/bulk/bulk-rest-api/build.gradle b/modules/apps/bulk/bulk-rest-api/build.gradle
index 783748a008fb77..1907a646887e6e 100644
--- a/modules/apps/bulk/bulk-rest-api/build.gradle
+++ b/modules/apps/bulk/bulk-rest-api/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:portal-odata:portal-odata-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/DocumentBulkSelection.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/DocumentBulkSelection.java
index 7535783d528a6b..de09e835164aad 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/DocumentBulkSelection.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/DocumentBulkSelection.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/GenericError.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/GenericError.java
index 0b71eadb9e5cb2..dece625c156632 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/GenericError.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/GenericError.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Keyword.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Keyword.java
index c21c6a3e86c22d..f6d85df91dc9c9 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Keyword.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Keyword.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/KeywordBulkSelection.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/KeywordBulkSelection.java
index 1039d43c6323ab..5402edd77362df 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/KeywordBulkSelection.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/KeywordBulkSelection.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Selection.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Selection.java
index 2c5b72a6a19591..20f7c09ffaa9da 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Selection.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Selection.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/SelectionScope.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/SelectionScope.java
index a9f0e70a98ffcd..5aec79e76e8089 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/SelectionScope.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/SelectionScope.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Status.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Status.java
index 9a311bf8aef2a3..a134f8183c039d 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Status.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/Status.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyCategory.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyCategory.java
index 9d6abeb2f05dc2..af414478bf4ce7 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyCategory.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyCategory.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyCategoryBulkSelection.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyCategoryBulkSelection.java
index 7d48fba2214d7b..bfb334a3778219 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyCategoryBulkSelection.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyCategoryBulkSelection.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyVocabulary.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyVocabulary.java
index 63fc8da72cad2d..3d0f5e007316be 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyVocabulary.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/dto/v1_0/TaxonomyVocabulary.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/KeywordResource.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/KeywordResource.java
index e1c0092a945d88..19edc055d0f368 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/KeywordResource.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/KeywordResource.java
@@ -18,18 +18,18 @@
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
import com.liferay.portal.vulcan.pagination.Page;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/SelectionResource.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/SelectionResource.java
index 781e4113be24e3..8c33876c1cac92 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/SelectionResource.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/SelectionResource.java
@@ -16,18 +16,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/StatusResource.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/StatusResource.java
index c432fa152ec13a..42a8ba83e9fe61 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/StatusResource.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/StatusResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/TaxonomyCategoryResource.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/TaxonomyCategoryResource.java
index 3b760304987593..2922dcc9556b03 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/TaxonomyCategoryResource.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/TaxonomyCategoryResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/TaxonomyVocabularyResource.java b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/TaxonomyVocabularyResource.java
index f9a3cf25358a90..94dffd6a8033b0 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/TaxonomyVocabularyResource.java
+++ b/modules/apps/bulk/bulk-rest-api/src/main/java/com/liferay/bulk/rest/resource/v1_0/TaxonomyVocabularyResource.java
@@ -17,18 +17,18 @@
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
import com.liferay.portal.vulcan.pagination.Page;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/resources/com/liferay/bulk/rest/dto/v1_0/packageinfo b/modules/apps/bulk/bulk-rest-api/src/main/resources/com/liferay/bulk/rest/dto/v1_0/packageinfo
index 0eb084a0c3e791..7ad5d987ec2033 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/resources/com/liferay/bulk/rest/dto/v1_0/packageinfo
+++ b/modules/apps/bulk/bulk-rest-api/src/main/resources/com/liferay/bulk/rest/dto/v1_0/packageinfo
@@ -1 +1 @@
-version 1.4.0
\ No newline at end of file
+version 1.4.1
\ No newline at end of file
diff --git a/modules/apps/bulk/bulk-rest-api/src/main/resources/com/liferay/bulk/rest/resource/v1_0/packageinfo b/modules/apps/bulk/bulk-rest-api/src/main/resources/com/liferay/bulk/rest/resource/v1_0/packageinfo
index 2c9afe82e39e46..50447f66aecefa 100644
--- a/modules/apps/bulk/bulk-rest-api/src/main/resources/com/liferay/bulk/rest/resource/v1_0/packageinfo
+++ b/modules/apps/bulk/bulk-rest-api/src/main/resources/com/liferay/bulk/rest/resource/v1_0/packageinfo
@@ -1 +1 @@
-version 2.1.0
\ No newline at end of file
+version 3.0.0
\ No newline at end of file
diff --git a/modules/apps/bulk/bulk-rest-client/build.gradle b/modules/apps/bulk/bulk-rest-client/build.gradle
index b802e77531117e..1c5c01ff57416f 100644
--- a/modules/apps/bulk/bulk-rest-client/build.gradle
+++ b/modules/apps/bulk/bulk-rest-client/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
}
\ No newline at end of file
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/aggregation/Aggregation.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/aggregation/Aggregation.java
index 9cd2db87829464..44c4dc8fbd96c8 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/aggregation/Aggregation.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/aggregation/Aggregation.java
@@ -5,11 +5,11 @@
package com.liferay.bulk.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/aggregation/Facet.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/aggregation/Facet.java
index 5cd88284f953d2..563004a808a8cb 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/aggregation/Facet.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/aggregation/Facet.java
@@ -5,11 +5,11 @@
package com.liferay.bulk.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/DocumentBulkSelection.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/DocumentBulkSelection.java
index 4290232271c7d0..b926b7b8fc02f0 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/DocumentBulkSelection.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/DocumentBulkSelection.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.DocumentBulkSelectionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/GenericError.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/GenericError.java
index 2bd6b11abf7220..b883fdfd7ffa30 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/GenericError.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/GenericError.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.GenericErrorSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Keyword.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Keyword.java
index 85e69cc57c8ef2..51de347ce13496 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Keyword.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Keyword.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.KeywordSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/KeywordBulkSelection.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/KeywordBulkSelection.java
index be0b2120465a21..857ee804925074 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/KeywordBulkSelection.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/KeywordBulkSelection.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.KeywordBulkSelectionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Selection.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Selection.java
index 72e78a616f36c0..19102bbed7e17f 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Selection.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Selection.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.SelectionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/SelectionScope.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/SelectionScope.java
index a2bf65286619fe..0caf83969d329b 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/SelectionScope.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/SelectionScope.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.SelectionScopeSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Status.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Status.java
index 89ed220b6e6107..6c84c191170ccf 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Status.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/Status.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.StatusSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyCategory.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyCategory.java
index 0785cf6caa5fc4..26c46b48b1160a 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyCategory.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyCategory.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.TaxonomyCategorySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyCategoryBulkSelection.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyCategoryBulkSelection.java
index 0d8ed9bf342e2e..a58ece49dc9ca5 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyCategoryBulkSelection.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyCategoryBulkSelection.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.TaxonomyCategoryBulkSelectionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyVocabulary.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyVocabulary.java
index 7c264f02a88561..f601df398c73dd 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyVocabulary.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/dto/v1_0/TaxonomyVocabulary.java
@@ -8,12 +8,12 @@
import com.liferay.bulk.rest.client.function.UnsafeSupplier;
import com.liferay.bulk.rest.client.serdes.v1_0.TaxonomyVocabularySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/function/UnsafeSupplier.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/function/UnsafeSupplier.java
index c85a69517541cb..52e4179ef985c3 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/function/UnsafeSupplier.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/function/UnsafeSupplier.java
@@ -5,7 +5,7 @@
package com.liferay.bulk.rest.client.function;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/http/HttpInvoker.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/http/HttpInvoker.java
index 11192e6df6d542..1905dee98e2760 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/http/HttpInvoker.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/http/HttpInvoker.java
@@ -5,6 +5,8 @@
package com.liferay.bulk.rest.client.http;
+import jakarta.annotation.Generated;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -29,8 +31,6 @@
import java.util.Set;
import java.util.regex.Matcher;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/json/BaseJSONParser.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/json/BaseJSONParser.java
index 38755c1a94d101..2ba9ca4e1d8e72 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/json/BaseJSONParser.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/json/BaseJSONParser.java
@@ -5,6 +5,8 @@
package com.liferay.bulk.rest.client.json;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -18,8 +20,6 @@
import java.util.Stack;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/pagination/Page.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/pagination/Page.java
index 86179b5bff0299..c241aecfb0c8f3 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/pagination/Page.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/pagination/Page.java
@@ -8,6 +8,8 @@
import com.liferay.bulk.rest.client.aggregation.Facet;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/pagination/Pagination.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/pagination/Pagination.java
index c9a6ec76f9817d..a9cb7be961abb0 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/pagination/Pagination.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/pagination/Pagination.java
@@ -5,7 +5,7 @@
package com.liferay.bulk.rest.client.pagination;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/permission/Permission.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/permission/Permission.java
index 27ece2a2c035c7..8479d9a541bdf8 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/permission/Permission.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/permission/Permission.java
@@ -7,9 +7,9 @@
import com.liferay.bulk.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/problem/Problem.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/problem/Problem.java
index f02d324db26a5a..51cf2d6b4c7c26 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/problem/Problem.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/problem/Problem.java
@@ -7,9 +7,9 @@
import com.liferay.bulk.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Alejandro Tardín
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/KeywordResource.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/KeywordResource.java
index cfbe07ec70db2b..58a57ae84c1a4e 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/KeywordResource.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/KeywordResource.java
@@ -13,6 +13,8 @@
import com.liferay.bulk.rest.client.problem.Problem;
import com.liferay.bulk.rest.client.serdes.v1_0.KeywordSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -22,8 +24,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/SelectionResource.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/SelectionResource.java
index 3a639b0714be03..8d5e78fc082c19 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/SelectionResource.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/SelectionResource.java
@@ -10,6 +10,8 @@
import com.liferay.bulk.rest.client.http.HttpInvoker;
import com.liferay.bulk.rest.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -19,8 +21,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/StatusResource.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/StatusResource.java
index ae055b645d06fd..d3b43491ca80d4 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/StatusResource.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/StatusResource.java
@@ -9,6 +9,8 @@
import com.liferay.bulk.rest.client.http.HttpInvoker;
import com.liferay.bulk.rest.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/TaxonomyCategoryResource.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/TaxonomyCategoryResource.java
index 835fcce959a70c..e23f4a96eeeb22 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/TaxonomyCategoryResource.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/TaxonomyCategoryResource.java
@@ -9,6 +9,8 @@
import com.liferay.bulk.rest.client.http.HttpInvoker;
import com.liferay.bulk.rest.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/TaxonomyVocabularyResource.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/TaxonomyVocabularyResource.java
index 5ea060f5b3ed43..2883f8557c1e71 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/TaxonomyVocabularyResource.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/resource/v1_0/TaxonomyVocabularyResource.java
@@ -12,6 +12,8 @@
import com.liferay.bulk.rest.client.problem.Problem;
import com.liferay.bulk.rest.client.serdes.v1_0.TaxonomyVocabularySerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/DocumentBulkSelectionSerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/DocumentBulkSelectionSerDes.java
index 44e355d3bf3189..bdbd75c59e3f7d 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/DocumentBulkSelectionSerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/DocumentBulkSelectionSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.DocumentBulkSelection;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/GenericErrorSerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/GenericErrorSerDes.java
index 2b6368431c449a..c63e87e701137d 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/GenericErrorSerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/GenericErrorSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.GenericError;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/KeywordBulkSelectionSerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/KeywordBulkSelectionSerDes.java
index a5a816e56fd380..f18cf237ec707b 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/KeywordBulkSelectionSerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/KeywordBulkSelectionSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.KeywordBulkSelection;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/KeywordSerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/KeywordSerDes.java
index 96fd5ca1156ee5..f6c67048af2f52 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/KeywordSerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/KeywordSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.Keyword;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/SelectionScopeSerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/SelectionScopeSerDes.java
index 4f73e7e2c3a0e7..ab0e844e7688b1 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/SelectionScopeSerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/SelectionScopeSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.SelectionScope;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/SelectionSerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/SelectionSerDes.java
index 333f45133c3f1a..c81ea45533aac1 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/SelectionSerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/SelectionSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.Selection;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/StatusSerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/StatusSerDes.java
index 9b1eca18a79476..3da7a474a109fd 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/StatusSerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/StatusSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.Status;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyCategoryBulkSelectionSerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyCategoryBulkSelectionSerDes.java
index d9e5892b37c4a4..72053ce453cc3f 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyCategoryBulkSelectionSerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyCategoryBulkSelectionSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.TaxonomyCategoryBulkSelection;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyCategorySerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyCategorySerDes.java
index e5faae346d82b4..ff03d23a09a138 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyCategorySerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyCategorySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.TaxonomyCategory;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyVocabularySerDes.java b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyVocabularySerDes.java
index b384f8430a3f0c..1a5b9aa08d9ee0 100644
--- a/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyVocabularySerDes.java
+++ b/modules/apps/bulk/bulk-rest-client/src/main/java/com/liferay/bulk/rest/client/serdes/v1_0/TaxonomyVocabularySerDes.java
@@ -9,14 +9,14 @@
import com.liferay.bulk.rest.client.dto.v1_0.TaxonomyVocabulary;
import com.liferay.bulk.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alejandro Tardín
* @generated
diff --git a/modules/apps/bulk/bulk-rest-impl/build.gradle b/modules/apps/bulk/bulk-rest-impl/build.gradle
index 0962db194c136c..8acddfd8ddd7f4 100644
--- a/modules/apps/bulk/bulk-rest-impl/build.gradle
+++ b/modules/apps/bulk/bulk-rest-impl/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/mutation/v1_0/Mutation.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/mutation/v1_0/Mutation.java
index 5c63104e32fcf8..3b26470c29b46c 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/mutation/v1_0/Mutation.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/mutation/v1_0/Mutation.java
@@ -24,16 +24,16 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.pagination.Page;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotEmpty;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/query/v1_0/Query.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/query/v1_0/Query.java
index 71b6a058442be3..fd153d8de848f1 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/query/v1_0/Query.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/query/v1_0/Query.java
@@ -16,15 +16,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.pagination.Page;
-import java.util.Map;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
index 2b507707a9428b..1dfe96f791e99a 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.util.ObjectValuePair;
import com.liferay.portal.vulcan.graphql.servlet.ServletData;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/jaxrs/application/BulkRESTApplication.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/jaxrs/application/BulkRESTApplication.java
index 46a10193ea4f36..3d95408abd1f7d 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/jaxrs/application/BulkRESTApplication.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/jaxrs/application/BulkRESTApplication.java
@@ -5,9 +5,9 @@
package com.liferay.bulk.rest.internal.jaxrs.application;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.core.Application;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseKeywordResourceImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseKeywordResourceImpl.java
index 39e233cc9f07b4..10624e25d01864 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseKeywordResourceImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseKeywordResourceImpl.java
@@ -25,24 +25,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alejandro Tardín
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseKeywordResourceImpl implements KeywordResource {
/**
@@ -53,10 +53,10 @@ public abstract class BaseKeywordResourceImpl implements KeywordResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Keyword")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/keywords/batch")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/keywords/batch")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void patchKeywordBatch(KeywordBulkSelection keywordBulkSelection)
throws Exception {
@@ -70,10 +70,10 @@ public void patchKeywordBatch(KeywordBulkSelection keywordBulkSelection)
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Keyword")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/keywords/batch")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/keywords/batch")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public void putKeywordBatch(KeywordBulkSelection keywordBulkSelection)
throws Exception {
@@ -87,10 +87,10 @@ public void putKeywordBatch(KeywordBulkSelection keywordBulkSelection)
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Keyword")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/keywords/common")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/keywords/common")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page postKeywordsCommonPage(
DocumentBulkSelection documentBulkSelection)
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseSelectionResourceImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseSelectionResourceImpl.java
index a2dca5375c9f9e..ec1a596dbca22c 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseSelectionResourceImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseSelectionResourceImpl.java
@@ -23,23 +23,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Alejandro Tardín
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseSelectionResourceImpl implements SelectionResource {
/**
@@ -50,10 +50,10 @@ public abstract class BaseSelectionResourceImpl implements SelectionResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Selection")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/bulk-selection")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/bulk-selection")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Selection postBulkSelection(
DocumentBulkSelection documentBulkSelection)
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseStatusResourceImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseStatusResourceImpl.java
index 5be5f0de7558c8..8581a2c6851413 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseStatusResourceImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseStatusResourceImpl.java
@@ -22,23 +22,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Alejandro Tardín
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseStatusResourceImpl implements StatusResource {
/**
@@ -49,9 +49,9 @@ public abstract class BaseStatusResourceImpl implements StatusResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Status")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/status")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/status")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Status getStatus() throws Exception {
return new Status();
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseTaxonomyCategoryResourceImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseTaxonomyCategoryResourceImpl.java
index a8f5e8ea0b2b7a..d7faa84d833195 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseTaxonomyCategoryResourceImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseTaxonomyCategoryResourceImpl.java
@@ -22,23 +22,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Alejandro Tardín
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseTaxonomyCategoryResourceImpl
implements TaxonomyCategoryResource {
@@ -52,10 +52,10 @@ public abstract class BaseTaxonomyCategoryResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "TaxonomyCategory")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/taxonomy-categories/batch")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/taxonomy-categories/batch")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void patchTaxonomyCategoryBatch(
TaxonomyCategoryBulkSelection taxonomyCategoryBulkSelection)
@@ -72,10 +72,10 @@ public void patchTaxonomyCategoryBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "TaxonomyCategory")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/taxonomy-categories/batch")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/taxonomy-categories/batch")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public void putTaxonomyCategoryBatch(
TaxonomyCategoryBulkSelection taxonomyCategoryBulkSelection)
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseTaxonomyVocabularyResourceImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseTaxonomyVocabularyResourceImpl.java
index 03b7df2a7ec578..d59f0711e28dc1 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseTaxonomyVocabularyResourceImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/BaseTaxonomyVocabularyResourceImpl.java
@@ -24,24 +24,24 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alejandro Tardín
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseTaxonomyVocabularyResourceImpl
implements TaxonomyVocabularyResource {
@@ -63,15 +63,15 @@ public abstract class BaseTaxonomyVocabularyResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "TaxonomyVocabulary")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/sites/{siteId}/taxonomy-vocabularies/common")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/sites/{siteId}/taxonomy-vocabularies/common")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page postSiteTaxonomyVocabulariesCommonPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("siteId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("siteId")
Long siteId,
DocumentBulkSelection documentBulkSelection)
throws Exception {
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/OpenAPIResourceImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
index 443d26684834ff..35273ee6273021 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
@@ -11,23 +11,23 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.info.License;
-import java.lang.reflect.Method;
+import jakarta.annotation.Generated;
-import java.util.HashSet;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.annotation.Generated;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.HashSet;
+import java.util.Set;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/KeywordResourceFactoryImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/KeywordResourceFactoryImpl.java
index 016ce397bb9934..0ef1c9aff10204 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/KeywordResourceFactoryImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/KeywordResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/SelectionResourceFactoryImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/SelectionResourceFactoryImpl.java
index e6fb0a6126478a..a8b69f4b5a6f30 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/SelectionResourceFactoryImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/SelectionResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/StatusResourceFactoryImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/StatusResourceFactoryImpl.java
index 4b5715c244b691..68a574e9c78f83 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/StatusResourceFactoryImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/StatusResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/TaxonomyCategoryResourceFactoryImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/TaxonomyCategoryResourceFactoryImpl.java
index d746c4aa969fe0..8a41dc7346c227 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/TaxonomyCategoryResourceFactoryImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/TaxonomyCategoryResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/TaxonomyVocabularyResourceFactoryImpl.java b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/TaxonomyVocabularyResourceFactoryImpl.java
index 4e290270bdb3fa..a9de3a0eb94db6 100644
--- a/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/TaxonomyVocabularyResourceFactoryImpl.java
+++ b/modules/apps/bulk/bulk-rest-impl/src/main/java/com/liferay/bulk/rest/internal/resource/v1_0/factory/TaxonomyVocabularyResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/bulk/bulk-rest-test/build.gradle b/modules/apps/bulk/bulk-rest-test/build.gradle
index 991e595748f5df..fe0677a1095cc9 100644
--- a/modules/apps/bulk/bulk-rest-test/build.gradle
+++ b/modules/apps/bulk/bulk-rest-test/build.gradle
@@ -2,8 +2,8 @@ dependencies {
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
- testIntegrationImplementation group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
+ testIntegrationImplementation group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ testIntegrationImplementation group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
testIntegrationImplementation project(":apps:bulk:bulk-rest-api")
testIntegrationImplementation project(":apps:bulk:bulk-rest-client")
testIntegrationImplementation project(":apps:portal-odata:portal-odata-api")
diff --git a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseKeywordResourceTestCase.java b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseKeywordResourceTestCase.java
index aec5bbceaa90c2..c3879c4e8caffc 100644
--- a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseKeywordResourceTestCase.java
+++ b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseKeywordResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseSelectionResourceTestCase.java b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseSelectionResourceTestCase.java
index b9256296d82db4..5b647ec587bea7 100644
--- a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseSelectionResourceTestCase.java
+++ b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseSelectionResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseStatusResourceTestCase.java b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseStatusResourceTestCase.java
index 777bbc5b7e1404..11054549dae12c 100644
--- a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseStatusResourceTestCase.java
+++ b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseStatusResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseTaxonomyCategoryResourceTestCase.java b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseTaxonomyCategoryResourceTestCase.java
index 5ddc91e05599df..41545b5abc3a3c 100644
--- a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseTaxonomyCategoryResourceTestCase.java
+++ b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseTaxonomyCategoryResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseTaxonomyVocabularyResourceTestCase.java b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseTaxonomyVocabularyResourceTestCase.java
index 17ae936f48c1c1..133adf6eca5fe3 100644
--- a/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseTaxonomyVocabularyResourceTestCase.java
+++ b/modules/apps/bulk/bulk-rest-test/src/testIntegration/java/com/liferay/bulk/rest/resource/v1_0/test/BaseTaxonomyVocabularyResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/bulk/bulk-selection-api/build.gradle b/modules/apps/bulk/bulk-selection-api/build.gradle
index ddc5f09efc7846..68a2b4439a35be 100644
--- a/modules/apps/bulk/bulk-selection-api/build.gradle
+++ b/modules/apps/bulk/bulk-selection-api/build.gradle
@@ -1,6 +1,6 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly project(":core:petra:petra-function")
compileOnly project(":core:petra:petra-string")
}
\ No newline at end of file
diff --git a/modules/apps/calendar/calendar-api/build.gradle b/modules/apps/calendar/calendar-api/build.gradle
index e6bd5cc08e6cf3..980fc265f7cd8b 100644
--- a/modules/apps/calendar/calendar-api/build.gradle
+++ b/modules/apps/calendar/calendar-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileInclude group: "com.liferay", name: "com.google.ical", version: "20110304"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":core:petra:petra-function")
diff --git a/modules/apps/calendar/calendar-service/build.gradle b/modules/apps/calendar/calendar-service/build.gradle
index 505dd9b056cd60..5d6ed642383cfe 100644
--- a/modules/apps/calendar/calendar-service/build.gradle
+++ b/modules/apps/calendar/calendar-service/build.gradle
@@ -12,13 +12,13 @@ dependencies {
compileInclude group: "org.jparsec", name: "jparsec", version: "3.1"
compileInclude group: "org.mnode.ical4j", name: "ical4j", version: "3.2.2"
compileOnly group: "com.liferay", name: "com.google.ical", version: "20110304"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.java", version: "default"
- compileOnly group: "com.sun.mail", name: "jakarta.mail", version: "1.6.6"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
+ compileOnly group: "jakarta.mail", name: "jakarta.mail-api", version: "2.1.3"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "joda-time", name: "joda-time", version: "2.12.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
compileOnly group: "org.joda", name: "joda-convert", version: "2.2.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarAdminPortletDataHandler.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarAdminPortletDataHandler.java
index 89d59dc4b3acee..0c2c8de239a14b 100644
--- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarAdminPortletDataHandler.java
+++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarAdminPortletDataHandler.java
@@ -34,9 +34,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.xml.Element;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -47,7 +47,7 @@
* @author Andrea Di Giorgi
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
service = PortletDataHandler.class
)
public class CalendarAdminPortletDataHandler extends BasePortletDataHandler {
diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarBookingStagedModelDataHandler.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarBookingStagedModelDataHandler.java
index 5d9821f4966c51..c70b5bbfa1c4c8 100644
--- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarBookingStagedModelDataHandler.java
+++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarBookingStagedModelDataHandler.java
@@ -41,7 +41,7 @@
* @author Daniel Kocsis
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
service = StagedModelDataHandler.class
)
public class CalendarBookingStagedModelDataHandler
diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarNotificationTemplateStagedModelDataHandler.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarNotificationTemplateStagedModelDataHandler.java
index 4e67eae327083c..cb026cc723fd28 100644
--- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarNotificationTemplateStagedModelDataHandler.java
+++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarNotificationTemplateStagedModelDataHandler.java
@@ -35,7 +35,7 @@
* @author Daniel Kocsis
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
service = StagedModelDataHandler.class
)
public class CalendarNotificationTemplateStagedModelDataHandler
diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarPortletDataHandler.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarPortletDataHandler.java
index 87c17a03710461..e097e8d2be6507 100644
--- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarPortletDataHandler.java
+++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarPortletDataHandler.java
@@ -13,7 +13,7 @@
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.module.framework.ModuleServiceLifecycle;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -23,7 +23,7 @@
* @author Arthur Chan
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR,
service = PortletDataHandler.class
)
public class CalendarPortletDataHandler extends BasePortletDataHandler {
diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarResourceStagedModelDataHandler.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarResourceStagedModelDataHandler.java
index 16cbcba2e77d79..f2a0ec9ae9cdad 100644
--- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarResourceStagedModelDataHandler.java
+++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarResourceStagedModelDataHandler.java
@@ -47,7 +47,7 @@
* @author Daniel Kocsis
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
service = StagedModelDataHandler.class
)
public class CalendarResourceStagedModelDataHandler
diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarStagedModelDataHandler.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarStagedModelDataHandler.java
index 53e94a593f1c26..02ee683b9cd72f 100644
--- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarStagedModelDataHandler.java
+++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/exportimport/data/handler/CalendarStagedModelDataHandler.java
@@ -40,7 +40,7 @@
* @author Daniel Kocsis
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
service = StagedModelDataHandler.class
)
public class CalendarStagedModelDataHandler
diff --git a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/notification/NotificationTemplateContextFactory.java b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/notification/NotificationTemplateContextFactory.java
index d06a968a5eeb2b..c3e1f993921df9 100644
--- a/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/notification/NotificationTemplateContextFactory.java
+++ b/modules/apps/calendar/calendar-service/src/main/java/com/liferay/calendar/internal/notification/NotificationTemplateContextFactory.java
@@ -36,6 +36,8 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.WindowState;
+
import java.io.Serializable;
import java.text.Format;
@@ -44,8 +46,6 @@
import java.util.Objects;
import java.util.TimeZone;
-import javax.portlet.WindowState;
-
/**
* @author Eduardo Lundgren
*/
@@ -131,7 +131,8 @@ public static NotificationTemplateContext getInstance(
"portletName",
LanguageUtil.get(
user.getLocale(),
- "javax.portlet.title.".concat(CalendarPortletKeys.CALENDAR))
+ "jakarta.portlet.title.".concat(
+ CalendarPortletKeys.CALENDAR))
).put(
"siteName",
() -> {
diff --git a/modules/apps/calendar/calendar-test-util/build.gradle b/modules/apps/calendar/calendar-test-util/build.gradle
index 84727fbd45e213..a525286f726194 100644
--- a/modules/apps/calendar/calendar-test-util/build.gradle
+++ b/modules/apps/calendar/calendar-test-util/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.test", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:calendar:calendar-api")
compileOnly project(":apps:static:portal:portal-upgrade-api")
diff --git a/modules/apps/calendar/calendar-test/build.gradle b/modules/apps/calendar/calendar-test/build.gradle
index f122bc66e9946b..6ac615acddf88f 100644
--- a/modules/apps/calendar/calendar-test/build.gradle
+++ b/modules/apps/calendar/calendar-test/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- testIntegrationImplementation group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ testIntegrationImplementation group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
testIntegrationImplementation group: "org.osgi", name: "osgi.core", version: "6.0.0"
testIntegrationImplementation project(":apps:calendar:calendar-api")
testIntegrationImplementation project(":apps:calendar:calendar-test-util")
diff --git a/modules/apps/calendar/calendar-web/build.gradle b/modules/apps/calendar/calendar-web/build.gradle
index 1c12de01f3b081..31ed72417c278f 100644
--- a/modules/apps/calendar/calendar-web/build.gradle
+++ b/modules/apps/calendar/calendar-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.java", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-api")
compileOnly project(":apps:asset:asset-display-page-api")
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/asset/model/CalendarBookingAssetRenderer.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/asset/model/CalendarBookingAssetRenderer.java
index 5448b56f55b117..7632be7fb10cb9 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/asset/model/CalendarBookingAssetRenderer.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/asset/model/CalendarBookingAssetRenderer.java
@@ -30,15 +30,15 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Fabio Pezzutto
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/asset/model/CalendarBookingAssetRendererFactory.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/asset/model/CalendarBookingAssetRendererFactory.java
index 1a5991b66e86f4..0f093efca86a11 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/asset/model/CalendarBookingAssetRendererFactory.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/asset/model/CalendarBookingAssetRendererFactory.java
@@ -27,10 +27,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
* @author Eduardo Lundgren
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR,
service = AssetRendererFactory.class
)
public class CalendarBookingAssetRendererFactory
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarBookingCTDisplayRenderer.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarBookingCTDisplayRenderer.java
index 4e540875d77af4..7d81b8c14e5f10 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarBookingCTDisplayRenderer.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarBookingCTDisplayRenderer.java
@@ -25,16 +25,16 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.Format;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarCTDisplayRenderer.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarCTDisplayRenderer.java
index b4b74359f97d66..a22e6f0fcf58cc 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarCTDisplayRenderer.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarCTDisplayRenderer.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarResourceCTDisplayRenderer.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarResourceCTDisplayRenderer.java
index c7a0aa3615bfb0..a947c629594208 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarResourceCTDisplayRenderer.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/change/tracking/spi/display/CalendarResourceCTDisplayRenderer.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/custom/attributes/CalendarCustomAttributesDisplay.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/custom/attributes/CalendarCustomAttributesDisplay.java
index 0c8589217756bb..3202e1684880e7 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/custom/attributes/CalendarCustomAttributesDisplay.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/custom/attributes/CalendarCustomAttributesDisplay.java
@@ -17,7 +17,7 @@
* @author Eduardo Lundgren
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR,
service = CustomAttributesDisplay.class
)
public class CalendarCustomAttributesDisplay
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/display/context/CalendarDisplayContext.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/display/context/CalendarDisplayContext.java
index 2d2b5c70975e21..0c464e5e4f20ee 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/display/context/CalendarDisplayContext.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/display/context/CalendarDisplayContext.java
@@ -62,19 +62,19 @@
import com.liferay.portal.kernel.util.comparator.UserScreenNameComparator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletSession;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Adam Brandizzi
*/
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/info/item/provider/CalendarBookingInfoItemFieldValuesProvider.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/info/item/provider/CalendarBookingInfoItemFieldValuesProvider.java
index 1ab7118f41fd60..d8590c1307792f 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/info/item/provider/CalendarBookingInfoItemFieldValuesProvider.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/info/item/provider/CalendarBookingInfoItemFieldValuesProvider.java
@@ -38,14 +38,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.WindowState;
+
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.WindowState;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/CalendarAdminPortlet.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/CalendarAdminPortlet.java
index c743b250d66726..44376f8cc989a7 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/CalendarAdminPortlet.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/CalendarAdminPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.calendar.constants.CalendarPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -25,12 +25,12 @@
"com.liferay.portlet.icon=/icons/calendar.png",
"com.liferay.portlet.preferences-owned-by-group=true",
"com.liferay.portlet.preferences-unique-per-layout=false",
- "javax.portlet.display-name=Calendar Admin",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Calendar Admin",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/CalendarPortlet.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/CalendarPortlet.java
index 967c517e29747e..baedcf93561885 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/CalendarPortlet.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/CalendarPortlet.java
@@ -116,6 +116,18 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.rss.util.RSSUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.io.IOException;
import java.util.ArrayList;
@@ -132,18 +144,6 @@
import java.util.Set;
import java.util.TimeZone;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -165,14 +165,14 @@
"com.liferay.portlet.icon=/icons/calendar.png",
"com.liferay.portlet.instanceable=true",
"com.liferay.portlet.preferences-owned-by-group=true",
- "javax.portlet.display-name=Calendar",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.copy-request-parameters=true",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CalendarPortletKeys.CALENDAR,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Calendar",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.copy-request-parameters=true",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/action/CalendarConfigurationAction.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/action/CalendarConfigurationAction.java
index 8a49ecf2aeb95e..61c1f641a28e32 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/action/CalendarConfigurationAction.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/action/CalendarConfigurationAction.java
@@ -12,12 +12,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.SessionClicks;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletPreferences;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
* @author Fabio Pezzutto
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR,
service = ConfigurationAction.class
)
public class CalendarConfigurationAction extends DefaultConfigurationAction {
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/route/CalendarFriendlyURLMapper.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/route/CalendarFriendlyURLMapper.java
index 87d2f20708d1af..af85e352195dd3 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/route/CalendarFriendlyURLMapper.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/portlet/route/CalendarFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + CalendarPortletKeys.CALENDAR
+ "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarResourceDisplayTerms.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarResourceDisplayTerms.java
index f34ce45cbe7d45..cfeaf0e6ba7abc 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarResourceDisplayTerms.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarResourceDisplayTerms.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.dao.search.DisplayTerms;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Eduardo Lundgren
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarResourceSearch.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarResourceSearch.java
index 5d4604c467ec8e..1cbb31e5751ded 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarResourceSearch.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarResourceSearch.java
@@ -11,13 +11,13 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.HashMapBuilder;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author Eduardo Lundgren
* @author Fabio Pezzutto
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarSearchContainer.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarSearchContainer.java
index 5a25cbd3540843..fc9db9f8e84954 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarSearchContainer.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/search/CalendarSearchContainer.java
@@ -7,8 +7,8 @@
import com.liferay.portal.kernel.dao.search.SearchContainer;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
/**
* @author Mariano Álvaro Sáiz
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/social/CalendarActivityInterpreter.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/social/CalendarActivityInterpreter.java
index 776252a95ba34a..efb55a42d471a2 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/social/CalendarActivityInterpreter.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/social/CalendarActivityInterpreter.java
@@ -23,8 +23,8 @@
import com.liferay.social.kernel.model.SocialActivityConstants;
import com.liferay.social.kernel.model.SocialActivityInterpreter;
-import javax.portlet.PortletRequest;
-import javax.portlet.WindowState;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.WindowState;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
* @author Marcellus Tavares
*/
@Component(
- property = "javax.portlet.name=" + CalendarPortletKeys.CALENDAR,
+ property = "jakarta.portlet.name=" + CalendarPortletKeys.CALENDAR,
service = SocialActivityInterpreter.class
)
public class CalendarActivityInterpreter extends BaseSocialActivityInterpreter {
diff --git a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/util/CalendarResourceUtil.java b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/util/CalendarResourceUtil.java
index 50409908a707e9..2384045a47dd15 100644
--- a/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/util/CalendarResourceUtil.java
+++ b/modules/apps/calendar/calendar-web/src/main/java/com/liferay/calendar/web/internal/util/CalendarResourceUtil.java
@@ -15,7 +15,7 @@
import com.liferay.portal.kernel.service.ServiceContextFactory;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Preston Crary
diff --git a/modules/apps/calendar/calendar-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/calendar/calendar-web/src/main/resources/META-INF/resources/init.jsp
index f29c007fa58080..befc067ad00a5d 100644
--- a/modules/apps/calendar/calendar-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/calendar/calendar-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -116,6 +116,9 @@ page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@
page import="com.liferay.rss.util.RSSUtil" %><%@
page import="com.liferay.taglib.search.ResultRow" %>
+<%@ page import="jakarta.portlet.PortletRequest" %><%@
+page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.text.Format" %>
<%@ page import="java.util.ArrayList" %><%@
@@ -126,9 +129,6 @@ page import="java.util.List" %><%@
page import="java.util.Objects" %><%@
page import="java.util.TimeZone" %>
-<%@ page import="javax.portlet.PortletRequest" %><%@
-page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/calendar/calendar-web/src/main/resources/META-INF/resources/js/legacy/remote_services.js b/modules/apps/calendar/calendar-web/src/main/resources/META-INF/resources/js/legacy/remote_services.js
index 3bb05a7d163de8..03f9553c1b5225 100644
--- a/modules/apps/calendar/calendar-web/src/main/resources/META-INF/resources/js/legacy/remote_services.js
+++ b/modules/apps/calendar/calendar-web/src/main/resources/META-INF/resources/js/legacy/remote_services.js
@@ -25,7 +25,7 @@ AUI.add(
const instance = this;
const actionParameters = {
- 'javax.portlet.action': config.actionName,
+ 'jakarta.portlet.action': config.actionName,
};
A.mix(actionParameters, config.queryParameters);
diff --git a/modules/apps/captcha/captcha-api/build.gradle b/modules/apps/captcha/captcha-api/build.gradle
index 25a979137847b2..dbb10a6b7a19ae 100644
--- a/modules/apps/captcha/captcha-api/build.gradle
+++ b/modules/apps/captcha/captcha-api/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileInclude group: "com.jhlabs", name: "filters", version: "2.0.235"
- compileInclude group: "com.liferay", name: "nl.captcha.simplecaptcha", version: "1.1.1"
+ compileInclude group: "com.liferay", name: "nl.captcha.simplecaptcha", version: "1.1.1.JAKARTA_LIFERAY-PATCHED-1"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/recaptcha/ReCaptchaImpl.java b/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/recaptcha/ReCaptchaImpl.java
index d84e93d7502f29..da2a240c763e88 100644
--- a/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/recaptcha/ReCaptchaImpl.java
+++ b/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/recaptcha/ReCaptchaImpl.java
@@ -26,15 +26,15 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.io.IOException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/simplecaptcha/SimpleCaptchaImpl.java b/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/simplecaptcha/SimpleCaptchaImpl.java
index ec9c3f8d708c2c..468436d3e1835d 100644
--- a/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/simplecaptcha/SimpleCaptchaImpl.java
+++ b/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/simplecaptcha/SimpleCaptchaImpl.java
@@ -22,21 +22,21 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletSession;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import nl.captcha.backgrounds.BackgroundProducer;
import nl.captcha.gimpy.GimpyRenderer;
import nl.captcha.noise.NoiseProducer;
diff --git a/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/util/CaptchaUtil.java b/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/util/CaptchaUtil.java
index c88ec043a212d9..6051cff7e02f4e 100644
--- a/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/util/CaptchaUtil.java
+++ b/modules/apps/captcha/captcha-api/src/main/java/com/liferay/captcha/util/CaptchaUtil.java
@@ -10,12 +10,12 @@
import com.liferay.portal.kernel.captcha.CaptchaException;
import com.liferay.portal.kernel.module.service.Snapshot;
-import java.io.IOException;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/captcha/captcha-impl/build.gradle b/modules/apps/captcha/captcha-impl/build.gradle
index d1ad885552a32e..1bc775fc05d150 100644
--- a/modules/apps/captcha/captcha-impl/build.gradle
+++ b/modules/apps/captcha/captcha-impl/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/captcha/captcha-rest-api/bnd.bnd b/modules/apps/captcha/captcha-rest-api/bnd.bnd
index fd79e603f9c035..da85bc0c8500a8 100644
--- a/modules/apps/captcha/captcha-rest-api/bnd.bnd
+++ b/modules/apps/captcha/captcha-rest-api/bnd.bnd
@@ -1,6 +1,6 @@
Bundle-Name: Liferay Captcha REST API
Bundle-SymbolicName: com.liferay.captcha.rest.api
-Bundle-Version: 3.0.6
+Bundle-Version: 4.0.0
Export-Package:\
com.liferay.captcha.rest.dto.v1_0,\
com.liferay.captcha.rest.resource.v1_0
\ No newline at end of file
diff --git a/modules/apps/captcha/captcha-rest-api/build.gradle b/modules/apps/captcha/captcha-rest-api/build.gradle
index 783748a008fb77..1907a646887e6e 100644
--- a/modules/apps/captcha/captcha-rest-api/build.gradle
+++ b/modules/apps/captcha/captcha-rest-api/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:portal-odata:portal-odata-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
diff --git a/modules/apps/captcha/captcha-rest-api/src/main/java/com/liferay/captcha/rest/dto/v1_0/Captcha.java b/modules/apps/captcha/captcha-rest-api/src/main/java/com/liferay/captcha/rest/dto/v1_0/Captcha.java
index 06915ed12f80fb..608ba650921eb6 100644
--- a/modules/apps/captcha/captcha-rest-api/src/main/java/com/liferay/captcha/rest/dto/v1_0/Captcha.java
+++ b/modules/apps/captcha/captcha-rest-api/src/main/java/com/liferay/captcha/rest/dto/v1_0/Captcha.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-api/src/main/java/com/liferay/captcha/rest/resource/v1_0/CaptchaResource.java b/modules/apps/captcha/captcha-rest-api/src/main/java/com/liferay/captcha/rest/resource/v1_0/CaptchaResource.java
index eac0b29dba4e2f..60c5ae2eb9e8ac 100644
--- a/modules/apps/captcha/captcha-rest-api/src/main/java/com/liferay/captcha/rest/resource/v1_0/CaptchaResource.java
+++ b/modules/apps/captcha/captcha-rest-api/src/main/java/com/liferay/captcha/rest/resource/v1_0/CaptchaResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/captcha/captcha-rest-api/src/main/resources/com/liferay/captcha/rest/dto/v1_0/packageinfo b/modules/apps/captcha/captcha-rest-api/src/main/resources/com/liferay/captcha/rest/dto/v1_0/packageinfo
index 682b435622a0aa..61bfc73502f0f2 100644
--- a/modules/apps/captcha/captcha-rest-api/src/main/resources/com/liferay/captcha/rest/dto/v1_0/packageinfo
+++ b/modules/apps/captcha/captcha-rest-api/src/main/resources/com/liferay/captcha/rest/dto/v1_0/packageinfo
@@ -1 +1 @@
-version 2.0.0
\ No newline at end of file
+version 2.0.1
\ No newline at end of file
diff --git a/modules/apps/captcha/captcha-rest-api/src/main/resources/com/liferay/captcha/rest/resource/v1_0/packageinfo b/modules/apps/captcha/captcha-rest-api/src/main/resources/com/liferay/captcha/rest/resource/v1_0/packageinfo
index 50447f66aecefa..bd333699d2e121 100644
--- a/modules/apps/captcha/captcha-rest-api/src/main/resources/com/liferay/captcha/rest/resource/v1_0/packageinfo
+++ b/modules/apps/captcha/captcha-rest-api/src/main/resources/com/liferay/captcha/rest/resource/v1_0/packageinfo
@@ -1 +1 @@
-version 3.0.0
\ No newline at end of file
+version 4.0.0
\ No newline at end of file
diff --git a/modules/apps/captcha/captcha-rest-client/build.gradle b/modules/apps/captcha/captcha-rest-client/build.gradle
index b802e77531117e..1c5c01ff57416f 100644
--- a/modules/apps/captcha/captcha-rest-client/build.gradle
+++ b/modules/apps/captcha/captcha-rest-client/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
}
\ No newline at end of file
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/aggregation/Aggregation.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/aggregation/Aggregation.java
index 6f150ea9afa8b5..ca80192e56971a 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/aggregation/Aggregation.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/aggregation/Aggregation.java
@@ -5,11 +5,11 @@
package com.liferay.captcha.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/aggregation/Facet.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/aggregation/Facet.java
index 437eace5081c52..80dbeb3d84ff5d 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/aggregation/Facet.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/aggregation/Facet.java
@@ -5,11 +5,11 @@
package com.liferay.captcha.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Generated;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/dto/v1_0/Captcha.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/dto/v1_0/Captcha.java
index ede1eab8fb7dbd..0ac6bb3f99d4eb 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/dto/v1_0/Captcha.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/dto/v1_0/Captcha.java
@@ -8,12 +8,12 @@
import com.liferay.captcha.rest.client.function.UnsafeSupplier;
import com.liferay.captcha.rest.client.serdes.v1_0.CaptchaSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/function/UnsafeSupplier.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/function/UnsafeSupplier.java
index e26af98edca81c..237f0ccc2a4a87 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/function/UnsafeSupplier.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/function/UnsafeSupplier.java
@@ -5,7 +5,7 @@
package com.liferay.captcha.rest.client.function;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Loc Pham
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/http/HttpInvoker.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/http/HttpInvoker.java
index 85bb888e42b132..1d5a09ba296dd4 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/http/HttpInvoker.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/http/HttpInvoker.java
@@ -5,6 +5,8 @@
package com.liferay.captcha.rest.client.http;
+import jakarta.annotation.Generated;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -29,8 +31,6 @@
import java.util.Set;
import java.util.regex.Matcher;
-import javax.annotation.Generated;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/json/BaseJSONParser.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/json/BaseJSONParser.java
index aeab12128f598f..09ad8ae3ef0399 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/json/BaseJSONParser.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/json/BaseJSONParser.java
@@ -5,6 +5,8 @@
package com.liferay.captcha.rest.client.json;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -18,8 +20,6 @@
import java.util.Stack;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/pagination/Page.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/pagination/Page.java
index b57996d8519d3f..2d108d52dc0bd6 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/pagination/Page.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/pagination/Page.java
@@ -8,6 +8,8 @@
import com.liferay.captcha.rest.client.aggregation.Facet;
import com.liferay.captcha.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.annotation.Generated;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/pagination/Pagination.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/pagination/Pagination.java
index f7c34c708f76e1..d7e18defa7ff97 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/pagination/Pagination.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/pagination/Pagination.java
@@ -5,7 +5,7 @@
package com.liferay.captcha.rest.client.pagination;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Loc Pham
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/permission/Permission.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/permission/Permission.java
index 90b5397a23493b..7fefb751d0c457 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/permission/Permission.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/permission/Permission.java
@@ -7,9 +7,9 @@
import com.liferay.captcha.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Loc Pham
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/problem/Problem.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/problem/Problem.java
index 6767135444e362..3b1ef6b934129b 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/problem/Problem.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/problem/Problem.java
@@ -7,9 +7,9 @@
import com.liferay.captcha.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Loc Pham
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/resource/v1_0/CaptchaResource.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/resource/v1_0/CaptchaResource.java
index cfd0ee666a7d5f..258296dc0d6307 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/resource/v1_0/CaptchaResource.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/resource/v1_0/CaptchaResource.java
@@ -10,6 +10,8 @@
import com.liferay.captcha.rest.client.problem.Problem;
import com.liferay.captcha.rest.client.serdes.v1_0.CaptchaSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -19,8 +21,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/serdes/v1_0/CaptchaSerDes.java b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/serdes/v1_0/CaptchaSerDes.java
index ce8fd6db721170..2e71e48e19b963 100644
--- a/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/serdes/v1_0/CaptchaSerDes.java
+++ b/modules/apps/captcha/captcha-rest-client/src/main/java/com/liferay/captcha/rest/client/serdes/v1_0/CaptchaSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.captcha.rest.client.dto.v1_0.Captcha;
import com.liferay.captcha.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Loc Pham
* @generated
diff --git a/modules/apps/captcha/captcha-rest-impl/build.gradle b/modules/apps/captcha/captcha-rest-impl/build.gradle
index fa8eb4efd0ce0f..ca7f76a612a774 100644
--- a/modules/apps/captcha/captcha-rest-impl/build.gradle
+++ b/modules/apps/captcha/captcha-rest-impl/build.gradle
@@ -1,13 +1,13 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/jaxrs/application/CaptchaRESTApplication.java b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/jaxrs/application/CaptchaRESTApplication.java
index 25b0d91b1434df..9e918de88d46ec 100644
--- a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/jaxrs/application/CaptchaRESTApplication.java
+++ b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/jaxrs/application/CaptchaRESTApplication.java
@@ -5,9 +5,9 @@
package com.liferay.captcha.rest.internal.jaxrs.application;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.core.Application;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/jaxrs/exception/mapper/CaptchaTextExceptionMapper.java b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/jaxrs/exception/mapper/CaptchaTextExceptionMapper.java
index 8c154f1a4d042a..300cabf853580b 100644
--- a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/jaxrs/exception/mapper/CaptchaTextExceptionMapper.java
+++ b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/jaxrs/exception/mapper/CaptchaTextExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/BaseCaptchaResourceImpl.java b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/BaseCaptchaResourceImpl.java
index 1e1184578132b2..d64b7f3b0e4648 100644
--- a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/BaseCaptchaResourceImpl.java
+++ b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/BaseCaptchaResourceImpl.java
@@ -22,23 +22,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Loc Pham
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCaptchaResourceImpl implements CaptchaResource {
/**
@@ -49,9 +49,9 @@ public abstract class BaseCaptchaResourceImpl implements CaptchaResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Captcha")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/captcha/challenge")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/captcha/challenge")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Captcha getCaptchaChallenge() throws Exception {
return new Captcha();
@@ -65,10 +65,10 @@ public Captcha getCaptchaChallenge() throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Captcha")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/captcha/response")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/captcha/response")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postCaptchaResponse(Captcha captcha) throws Exception {
}
diff --git a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/CaptchaResourceImpl.java b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/CaptchaResourceImpl.java
index 7b38bcdee24853..bc79c663f0edb1 100644
--- a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/CaptchaResourceImpl.java
+++ b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/CaptchaResourceImpl.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Time;
import com.liferay.portal.servlet.filters.secure.NonceUtil;
-import java.io.ByteArrayOutputStream;
+import jakarta.ws.rs.ForbiddenException;
-import javax.ws.rs.ForbiddenException;
+import java.io.ByteArrayOutputStream;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/OpenAPIResourceImpl.java b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
index b711f67a62b3f5..b06193929000d9 100644
--- a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
+++ b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
@@ -11,23 +11,23 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.info.License;
-import java.lang.reflect.Method;
+import jakarta.annotation.Generated;
-import java.util.HashSet;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.annotation.Generated;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.HashSet;
+import java.util.Set;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/factory/CaptchaResourceFactoryImpl.java b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/factory/CaptchaResourceFactoryImpl.java
index 7794d9451536b2..aae0cdaa6edeaf 100644
--- a/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/factory/CaptchaResourceFactoryImpl.java
+++ b/modules/apps/captcha/captcha-rest-impl/src/main/java/com/liferay/captcha/rest/internal/resource/v1_0/factory/CaptchaResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/captcha/captcha-rest-test/build.gradle b/modules/apps/captcha/captcha-rest-test/build.gradle
index 783ad74f985652..031e3e86007e30 100644
--- a/modules/apps/captcha/captcha-rest-test/build.gradle
+++ b/modules/apps/captcha/captcha-rest-test/build.gradle
@@ -2,8 +2,8 @@ dependencies {
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
- testIntegrationImplementation group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
+ testIntegrationImplementation group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ testIntegrationImplementation group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
testIntegrationImplementation project(":apps:captcha:captcha-rest-api")
testIntegrationImplementation project(":apps:captcha:captcha-rest-client")
testIntegrationImplementation project(":apps:portal-odata:portal-odata-api")
diff --git a/modules/apps/captcha/captcha-rest-test/src/testIntegration/java/com/liferay/captcha/rest/resource/v1_0/test/BaseCaptchaResourceTestCase.java b/modules/apps/captcha/captcha-rest-test/src/testIntegration/java/com/liferay/captcha/rest/resource/v1_0/test/BaseCaptchaResourceTestCase.java
index 99570c470de524..aefbc132d292dd 100644
--- a/modules/apps/captcha/captcha-rest-test/src/testIntegration/java/com/liferay/captcha/rest/resource/v1_0/test/BaseCaptchaResourceTestCase.java
+++ b/modules/apps/captcha/captcha-rest-test/src/testIntegration/java/com/liferay/captcha/rest/resource/v1_0/test/BaseCaptchaResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/captcha/captcha-taglib/build.gradle b/modules/apps/captcha/captcha-taglib/build.gradle
index d420ffa5d5190e..6431e8a822eccb 100644
--- a/modules/apps/captcha/captcha-taglib/build.gradle
+++ b/modules/apps/captcha/captcha-taglib/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:captcha:captcha-api")
compileOnly project(":apps:frontend-taglib:frontend-taglib-clay")
diff --git a/modules/apps/captcha/captcha-taglib/src/main/java/com/liferay/captcha/taglib/internal/struts/GetCaptchaImageStrutsAction.java b/modules/apps/captcha/captcha-taglib/src/main/java/com/liferay/captcha/taglib/internal/struts/GetCaptchaImageStrutsAction.java
index 64e3f81e32f436..417ce2527bd442 100644
--- a/modules/apps/captcha/captcha-taglib/src/main/java/com/liferay/captcha/taglib/internal/struts/GetCaptchaImageStrutsAction.java
+++ b/modules/apps/captcha/captcha-taglib/src/main/java/com/liferay/captcha/taglib/internal/struts/GetCaptchaImageStrutsAction.java
@@ -8,8 +8,8 @@
import com.liferay.captcha.util.CaptchaUtil;
import com.liferay.portal.kernel.struts.StrutsAction;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/captcha/captcha-taglib/src/main/java/com/liferay/captcha/taglib/servlet/taglib/CaptchaTag.java b/modules/apps/captcha/captcha-taglib/src/main/java/com/liferay/captcha/taglib/servlet/taglib/CaptchaTag.java
index 692b28cbb28e0f..69b910947f2019 100644
--- a/modules/apps/captcha/captcha-taglib/src/main/java/com/liferay/captcha/taglib/servlet/taglib/CaptchaTag.java
+++ b/modules/apps/captcha/captcha-taglib/src/main/java/com/liferay/captcha/taglib/servlet/taglib/CaptchaTag.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Brian Wing Shun Chan
diff --git a/modules/apps/captcha/captcha-taglib/src/main/resources/META-INF/resources/captcha/init.jsp b/modules/apps/captcha/captcha-taglib/src/main/resources/META-INF/resources/captcha/init.jsp
index e75562e268863d..90c7df45429a53 100644
--- a/modules/apps/captcha/captcha-taglib/src/main/resources/META-INF/resources/captcha/init.jsp
+++ b/modules/apps/captcha/captcha-taglib/src/main/resources/META-INF/resources/captcha/init.jsp
@@ -7,7 +7,7 @@
<%@ include file="/init.jsp" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/captcha/captcha-test/build.gradle b/modules/apps/captcha/captcha-test/build.gradle
index 1ad71dbb5c524e..dcc9a9c20cf74e 100644
--- a/modules/apps/captcha/captcha-test/build.gradle
+++ b/modules/apps/captcha/captcha-test/build.gradle
@@ -1,5 +1,5 @@
dependencies {
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation project(":apps:captcha:captcha-api")
testIntegrationImplementation project(":apps:configuration-admin:configuration-admin-api")
testIntegrationImplementation project(":apps:portal-configuration:portal-configuration-test-util")
diff --git a/modules/apps/captcha/captcha-test/src/testIntegration/java/com/liferay/captcha/configuration/test/CaptchaConfigurationTest.java b/modules/apps/captcha/captcha-test/src/testIntegration/java/com/liferay/captcha/configuration/test/CaptchaConfigurationTest.java
index 27691d600d7525..dc299b767a8683 100644
--- a/modules/apps/captcha/captcha-test/src/testIntegration/java/com/liferay/captcha/configuration/test/CaptchaConfigurationTest.java
+++ b/modules/apps/captcha/captcha-test/src/testIntegration/java/com/liferay/captcha/configuration/test/CaptchaConfigurationTest.java
@@ -21,16 +21,16 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.WindowState;
+
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.WindowState;
-
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Rule;
diff --git a/modules/apps/change-tracking/change-tracking-api/build.gradle b/modules/apps/change-tracking/change-tracking-api/build.gradle
index f9b691b45e2650..f2afa266706e12 100644
--- a/modules/apps/change-tracking/change-tracking-api/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:static:portal-configuration:portal-configuration-metatype-api")
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/bnd.bnd b/modules/apps/change-tracking/change-tracking-rest-api/bnd.bnd
index 953e62cdd90320..176bcf7fd48350 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/bnd.bnd
+++ b/modules/apps/change-tracking/change-tracking-rest-api/bnd.bnd
@@ -1,6 +1,6 @@
Bundle-Name: Liferay Change Tracking REST API
Bundle-SymbolicName: com.liferay.change.tracking.rest.api
-Bundle-Version: 5.0.2
+Bundle-Version: 6.0.0
Export-Package:\
com.liferay.change.tracking.rest.dto.v1_0,\
com.liferay.change.tracking.rest.resource.v1_0
\ No newline at end of file
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/build.gradle b/modules/apps/change-tracking/change-tracking-rest-api/build.gradle
index 783748a008fb77..1907a646887e6e 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-rest-api/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:portal-odata:portal-odata-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTCollection.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTCollection.java
index a14e5a24eba82e..7f6f5f0b715dce 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTCollection.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTCollection.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,12 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTEntry.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTEntry.java
index b415e12269da39..a081609eefa666 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTEntry.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTEntry.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,12 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTProcess.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTProcess.java
index 8abfd158067702..d8f81bc08e963e 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTProcess.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTProcess.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,12 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTRemote.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTRemote.java
index 8fe6393b500437..381ca632fcc6f0 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTRemote.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/CTRemote.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,12 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/Status.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/Status.java
index 7b65f00a9c7e01..491a545b4b6ded 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/Status.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/dto/v1_0/Status.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTCollectionResource.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTCollectionResource.java
index 4d9268da68d1d2..129ecebdba212c 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTCollectionResource.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTCollectionResource.java
@@ -19,20 +19,20 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTEntryResource.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTEntryResource.java
index 0533770da5486a..6dc4f5a9262570 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTEntryResource.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTEntryResource.java
@@ -19,18 +19,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTProcessResource.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTProcessResource.java
index 13707b18779cb1..56b3719ccba774 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTProcessResource.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTProcessResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTRemoteResource.java b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTRemoteResource.java
index 0ae8e7c9a15fbd..b39bea1495b295 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTRemoteResource.java
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/java/com/liferay/change/tracking/rest/resource/v1_0/CTRemoteResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/resources/com/liferay/change/tracking/rest/dto/v1_0/packageinfo b/modules/apps/change-tracking/change-tracking-rest-api/src/main/resources/com/liferay/change/tracking/rest/dto/v1_0/packageinfo
index bbcbfe4fb3b987..48889f2f40bd9a 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/resources/com/liferay/change/tracking/rest/dto/v1_0/packageinfo
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/resources/com/liferay/change/tracking/rest/dto/v1_0/packageinfo
@@ -1 +1 @@
-version 2.2.0
\ No newline at end of file
+version 2.2.1
\ No newline at end of file
diff --git a/modules/apps/change-tracking/change-tracking-rest-api/src/main/resources/com/liferay/change/tracking/rest/resource/v1_0/packageinfo b/modules/apps/change-tracking/change-tracking-rest-api/src/main/resources/com/liferay/change/tracking/rest/resource/v1_0/packageinfo
index dde115d61ba0bb..3bfba5374021c0 100644
--- a/modules/apps/change-tracking/change-tracking-rest-api/src/main/resources/com/liferay/change/tracking/rest/resource/v1_0/packageinfo
+++ b/modules/apps/change-tracking/change-tracking-rest-api/src/main/resources/com/liferay/change/tracking/rest/resource/v1_0/packageinfo
@@ -1 +1 @@
-version 5.0.0
\ No newline at end of file
+version 6.0.0
\ No newline at end of file
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/build.gradle b/modules/apps/change-tracking/change-tracking-rest-client/build.gradle
index b802e77531117e..1c5c01ff57416f 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-rest-client/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
}
\ No newline at end of file
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/aggregation/Aggregation.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/aggregation/Aggregation.java
index c140dfc918dcc2..235c88188a6b8b 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/aggregation/Aggregation.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/aggregation/Aggregation.java
@@ -5,11 +5,11 @@
package com.liferay.change.tracking.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/aggregation/Facet.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/aggregation/Facet.java
index 7c664ea2a443e0..1e7f60aca3c777 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/aggregation/Facet.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/aggregation/Facet.java
@@ -5,11 +5,11 @@
package com.liferay.change.tracking.rest.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTCollection.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTCollection.java
index 3ff9df8b439edb..ca16c887f98dfa 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTCollection.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTCollection.java
@@ -8,14 +8,14 @@
import com.liferay.change.tracking.rest.client.function.UnsafeSupplier;
import com.liferay.change.tracking.rest.client.serdes.v1_0.CTCollectionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTEntry.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTEntry.java
index a1f2ee1cb9da29..b0f95ca8af28f2 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTEntry.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTEntry.java
@@ -8,14 +8,14 @@
import com.liferay.change.tracking.rest.client.function.UnsafeSupplier;
import com.liferay.change.tracking.rest.client.serdes.v1_0.CTEntrySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTProcess.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTProcess.java
index 3722c1f316a6c7..3234072a3e527b 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTProcess.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTProcess.java
@@ -8,14 +8,14 @@
import com.liferay.change.tracking.rest.client.function.UnsafeSupplier;
import com.liferay.change.tracking.rest.client.serdes.v1_0.CTProcessSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTRemote.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTRemote.java
index 456597361351b1..f465f550a72a24 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTRemote.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/CTRemote.java
@@ -8,14 +8,14 @@
import com.liferay.change.tracking.rest.client.function.UnsafeSupplier;
import com.liferay.change.tracking.rest.client.serdes.v1_0.CTRemoteSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/Status.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/Status.java
index 30311962750904..85f92671d66f66 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/Status.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/dto/v1_0/Status.java
@@ -8,12 +8,12 @@
import com.liferay.change.tracking.rest.client.function.UnsafeSupplier;
import com.liferay.change.tracking.rest.client.serdes.v1_0.StatusSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/function/UnsafeSupplier.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/function/UnsafeSupplier.java
index 94c60c83d9f232..5e7d23910a2f54 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/function/UnsafeSupplier.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/function/UnsafeSupplier.java
@@ -5,7 +5,7 @@
package com.liferay.change.tracking.rest.client.function;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author David Truong
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/http/HttpInvoker.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/http/HttpInvoker.java
index 1e6d09faedf65d..8dc2bc0cc1c9ce 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/http/HttpInvoker.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/http/HttpInvoker.java
@@ -5,6 +5,8 @@
package com.liferay.change.tracking.rest.client.http;
+import jakarta.annotation.Generated;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -29,8 +31,6 @@
import java.util.Set;
import java.util.regex.Matcher;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/json/BaseJSONParser.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/json/BaseJSONParser.java
index d6c6ee1f914120..37cd7b8c82666e 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/json/BaseJSONParser.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/json/BaseJSONParser.java
@@ -5,6 +5,8 @@
package com.liferay.change.tracking.rest.client.json;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -18,8 +20,6 @@
import java.util.Stack;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/pagination/Page.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/pagination/Page.java
index 90b2501eaccc38..6d4d30d3433ba2 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/pagination/Page.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/pagination/Page.java
@@ -8,6 +8,8 @@
import com.liferay.change.tracking.rest.client.aggregation.Facet;
import com.liferay.change.tracking.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/pagination/Pagination.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/pagination/Pagination.java
index 17c571eccd3866..cae91bff7dfc14 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/pagination/Pagination.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/pagination/Pagination.java
@@ -5,7 +5,7 @@
package com.liferay.change.tracking.rest.client.pagination;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author David Truong
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/permission/Permission.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/permission/Permission.java
index be1b2f3c0738ad..5bffe0c4755e88 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/permission/Permission.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/permission/Permission.java
@@ -7,9 +7,9 @@
import com.liferay.change.tracking.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author David Truong
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/problem/Problem.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/problem/Problem.java
index cc5ef42c0047c0..30ac28b9d29120 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/problem/Problem.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/problem/Problem.java
@@ -7,9 +7,9 @@
import com.liferay.change.tracking.rest.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author David Truong
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTCollectionResource.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTCollectionResource.java
index 9d548ed9be82a1..bd488ee9eacaa1 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTCollectionResource.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTCollectionResource.java
@@ -12,6 +12,8 @@
import com.liferay.change.tracking.rest.client.problem.Problem;
import com.liferay.change.tracking.rest.client.serdes.v1_0.CTCollectionSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.text.DateFormat;
@@ -24,8 +26,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTEntryResource.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTEntryResource.java
index f450e49a57d0d5..250f8437965a47 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTEntryResource.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTEntryResource.java
@@ -12,6 +12,8 @@
import com.liferay.change.tracking.rest.client.problem.Problem;
import com.liferay.change.tracking.rest.client.serdes.v1_0.CTEntrySerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTProcessResource.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTProcessResource.java
index 09e6dbb0772e94..402742258c809e 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTProcessResource.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTProcessResource.java
@@ -12,6 +12,8 @@
import com.liferay.change.tracking.rest.client.problem.Problem;
import com.liferay.change.tracking.rest.client.serdes.v1_0.CTProcessSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTRemoteResource.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTRemoteResource.java
index f6d3afef62fb5e..c0f1984cd8665d 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTRemoteResource.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/resource/v1_0/CTRemoteResource.java
@@ -12,6 +12,8 @@
import com.liferay.change.tracking.rest.client.problem.Problem;
import com.liferay.change.tracking.rest.client.serdes.v1_0.CTRemoteSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTCollectionSerDes.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTCollectionSerDes.java
index fca474db0fcd8f..bb6fc34123de71 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTCollectionSerDes.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTCollectionSerDes.java
@@ -8,6 +8,8 @@
import com.liferay.change.tracking.rest.client.dto.v1_0.CTCollection;
import com.liferay.change.tracking.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTEntrySerDes.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTEntrySerDes.java
index 8c4d59913aeefd..a865d20fd12fe1 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTEntrySerDes.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTEntrySerDes.java
@@ -8,6 +8,8 @@
import com.liferay.change.tracking.rest.client.dto.v1_0.CTEntry;
import com.liferay.change.tracking.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTProcessSerDes.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTProcessSerDes.java
index 52de19cb99ec40..2e1087b56a40ff 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTProcessSerDes.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTProcessSerDes.java
@@ -8,6 +8,8 @@
import com.liferay.change.tracking.rest.client.dto.v1_0.CTProcess;
import com.liferay.change.tracking.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTRemoteSerDes.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTRemoteSerDes.java
index 143d8e1bc4f23f..cd81c02a91970b 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTRemoteSerDes.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/CTRemoteSerDes.java
@@ -8,6 +8,8 @@
import com.liferay.change.tracking.rest.client.dto.v1_0.CTRemote;
import com.liferay.change.tracking.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/StatusSerDes.java b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/StatusSerDes.java
index 9d798d37bd666a..991f0f23bea1a1 100644
--- a/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/StatusSerDes.java
+++ b/modules/apps/change-tracking/change-tracking-rest-client/src/main/java/com/liferay/change/tracking/rest/client/serdes/v1_0/StatusSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.change.tracking.rest.client.dto.v1_0.Status;
import com.liferay.change.tracking.rest.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author David Truong
* @generated
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/build.gradle b/modules/apps/change-tracking/change-tracking-rest-impl/build.gradle
index 1e4a04f23a4967..2628263e8f8c8a 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/build.gradle
@@ -1,11 +1,11 @@
dependencies {
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/dto/v1_0/converter/CTCollectionDTOConverter.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/dto/v1_0/converter/CTCollectionDTOConverter.java
index d87bf1f1f60ae3..95ddd8e59ed291 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/dto/v1_0/converter/CTCollectionDTOConverter.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/dto/v1_0/converter/CTCollectionDTOConverter.java
@@ -23,11 +23,11 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverter;
import com.liferay.portal.vulcan.dto.converter.DTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Date;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/dto/v1_0/converter/CTEntryDTOConverter.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/dto/v1_0/converter/CTEntryDTOConverter.java
index b4161cf88284fe..ff1d169c4c16b2 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/dto/v1_0/converter/CTEntryDTOConverter.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/dto/v1_0/converter/CTEntryDTOConverter.java
@@ -23,11 +23,11 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverter;
import com.liferay.portal.vulcan.dto.converter.DTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Date;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/mutation/v1_0/Mutation.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/mutation/v1_0/Mutation.java
index b0afefe0f62d74..a1cd15d7ce87b2 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/mutation/v1_0/Mutation.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/mutation/v1_0/Mutation.java
@@ -20,16 +20,16 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLField;
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
-import java.util.Date;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.Date;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/query/v1_0/Query.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/query/v1_0/Query.java
index 5f7645b919c820..8281b1d8285863 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/query/v1_0/Query.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/query/v1_0/Query.java
@@ -24,17 +24,17 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
-import java.util.Map;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotEmpty;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
index 6a5ee55e100108..de4d806b0dcfb5 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/graphql/servlet/v1_0/ServletDataImpl.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.util.ObjectValuePair;
import com.liferay.portal.vulcan.graphql.servlet.ServletData;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/jaxrs/application/ChangeTrackingRESTApplication.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/jaxrs/application/ChangeTrackingRESTApplication.java
index 4ee7bd360fcb9f..6f4c242ce232ae 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/jaxrs/application/ChangeTrackingRESTApplication.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/jaxrs/application/ChangeTrackingRESTApplication.java
@@ -5,9 +5,9 @@
package com.liferay.change.tracking.rest.internal.jaxrs.application;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.core.Application;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/jaxrs/exception/mapper/CTCollectionStatusExceptionMapper.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/jaxrs/exception/mapper/CTCollectionStatusExceptionMapper.java
index a26db26814094a..dc96cff807d552 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/jaxrs/exception/mapper/CTCollectionStatusExceptionMapper.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/jaxrs/exception/mapper/CTCollectionStatusExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTCollectionResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTCollectionResourceImpl.java
index d4e424a801d151..9bad85d1660d17 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTCollectionResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTCollectionResourceImpl.java
@@ -40,6 +40,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -50,23 +61,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author David Truong
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCTCollectionResourceImpl
implements CTCollectionResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -104,19 +104,19 @@ public abstract class BaseCTCollectionResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-collections")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-collections")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getCTCollectionsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("status")
+ @jakarta.ws.rs.QueryParam("status")
Integer[] status,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -159,29 +159,29 @@ public Page getCTCollectionsPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/ct-collections/export-batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/ct-collections/export-batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCTCollectionsPageExportBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("status")
+ @jakarta.ws.rs.QueryParam("status")
Integer[] status,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.DefaultValue("JSON")
- @javax.ws.rs.QueryParam("contentType")
+ @jakarta.ws.rs.DefaultValue("JSON")
+ @jakarta.ws.rs.QueryParam("contentType")
String contentType,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("fieldNames")
+ @jakarta.ws.rs.QueryParam("fieldNames")
String fieldNames)
throws Exception {
@@ -212,10 +212,10 @@ public Response postCTCollectionsPageExportBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/ct-collections")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/ct-collections")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTCollection postCTCollection(CTCollection ctCollection)
throws Exception {
@@ -239,15 +239,15 @@ public CTCollection postCTCollection(CTCollection ctCollection)
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/ct-collections/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/ct-collections/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCTCollectionBatch(
CTCollection ctCollection,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -284,16 +284,16 @@ public Response postCTCollectionBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/ct-collections/by-external-reference-code/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteCTCollectionByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
}
@@ -314,16 +314,16 @@ public void deleteCTCollectionByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/ct-collections/by-external-reference-code/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTCollection getCTCollectionByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -346,17 +346,17 @@ public CTCollection getCTCollectionByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/ct-collections/by-external-reference-code/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTCollection patchCTCollectionByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
CTCollection ctCollection)
throws Exception {
@@ -380,16 +380,16 @@ public CTCollection patchCTCollectionByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Path(
"/ct-collections/by-external-reference-code/{externalReferenceCode}/publish"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postCTCollectionByExternalReferenceCodePublish(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
}
@@ -414,19 +414,19 @@ public void postCTCollectionByExternalReferenceCodePublish(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Path(
"/ct-collections/by-external-reference-code/{externalReferenceCode}/schedule-publish"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postCTCollectionByExternalReferenceCodeSchedulePublish(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("publishDate")
+ @jakarta.ws.rs.QueryParam("publishDate")
Date publishDate)
throws Exception {
}
@@ -447,16 +447,16 @@ public void postCTCollectionByExternalReferenceCodeSchedulePublish(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/ct-collections/by-external-reference-code/{externalReferenceCode}/share-link"
)
- @javax.ws.rs.Produces("text/plain")
+ @jakarta.ws.rs.Produces("text/plain")
@Override
public String getCTCollectionByExternalReferenceCodeShareLink(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -479,14 +479,14 @@ public String getCTCollectionByExternalReferenceCodeShareLink(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-collections/b{ctCollectionId}/share-link")
- @javax.ws.rs.Produces("text/plain")
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-collections/b{ctCollectionId}/share-link")
+ @jakarta.ws.rs.Produces("text/plain")
@Override
public String getCTCollectionShareLink(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId)
throws Exception {
@@ -509,14 +509,14 @@ public String getCTCollectionShareLink(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteCTCollection(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId)
throws Exception {
}
@@ -541,18 +541,18 @@ public void deleteCTCollection(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteCTCollectionBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -589,14 +589,14 @@ public Response deleteCTCollectionBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTCollection getCTCollection(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId)
throws Exception {
@@ -619,15 +619,15 @@ public CTCollection getCTCollection(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTCollection patchCTCollection(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId,
CTCollection ctCollection)
throws Exception {
@@ -668,15 +668,15 @@ public CTCollection patchCTCollection(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public CTCollection putCTCollection(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId,
CTCollection ctCollection)
throws Exception {
@@ -704,19 +704,19 @@ public CTCollection putCTCollection(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}/batch")
- @javax.ws.rs.Produces("application/json")
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}/batch")
+ @jakarta.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.PUT
@Override
public Response putCTCollectionBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId,
CTCollection ctCollection,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -753,14 +753,14 @@ public Response putCTCollectionBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}/checkout")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}/checkout")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postCTCollectionCheckout(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId)
throws Exception {
}
@@ -781,14 +781,14 @@ public void postCTCollectionCheckout(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}/publish")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}/publish")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postCTCollectionPublish(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId)
throws Exception {
}
@@ -813,17 +813,17 @@ public void postCTCollectionPublish(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTCollection")}
)
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}/schedule-publish")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}/schedule-publish")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postCTCollectionSchedulePublish(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("publishDate")
+ @jakarta.ws.rs.QueryParam("publishDate")
Date publishDate)
throws Exception {
}
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTEntryResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTEntryResourceImpl.java
index bfcfbbe7e9927a..f5153adf003adf 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTEntryResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTEntryResourceImpl.java
@@ -38,6 +38,15 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -47,21 +56,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author David Truong
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCTEntryResourceImpl
implements CTEntryResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -107,25 +107,25 @@ public abstract class BaseCTEntryResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTEntry")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-collections/{ctCollectionId}/ct-entries")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-collections/{ctCollectionId}/ct-entries")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getCtCollectionCTEntriesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("showHideable")
+ @jakarta.ws.rs.QueryParam("showHideable")
Boolean showHideable,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -156,25 +156,25 @@ public Page getCtCollectionCTEntriesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTEntry")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/ct-collections/{ctCollectionId}/ct-entries/by-model-class-name-id/{modelClassNameId}/by-model-class-pk/{modelClassPK}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTEntry
getCtCollectionCTEntryByModelClassNameByModelClassPkModelClassPK(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctCollectionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctCollectionId")
Long ctCollectionId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("modelClassNameId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("modelClassNameId")
Long modelClassNameId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("modelClassPK")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("modelClassPK")
Long modelClassPK)
throws Exception {
@@ -225,28 +225,28 @@ public Page getCtCollectionCTEntriesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTEntry")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-entries/history")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-entries/history")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getCTEntriesHistoryPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.QueryParam("classNameId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.QueryParam("classNameId")
Long classNameId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("classPK")
+ @jakarta.ws.rs.QueryParam("classPK")
Long classPK,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("siteId")
+ @jakarta.ws.rs.QueryParam("siteId")
Long siteId,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -269,14 +269,14 @@ public Page getCTEntriesHistoryPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTEntry")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-entries/{ctEntryId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-entries/{ctEntryId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTEntry getCTEntry(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctEntryId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctEntryId")
Long ctEntryId)
throws Exception {
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTProcessResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTProcessResourceImpl.java
index eef8d98d16ac9a..2c14b6aa49b0d7 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTProcessResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTProcessResourceImpl.java
@@ -38,6 +38,16 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -47,22 +57,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author David Truong
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCTProcessResourceImpl
implements CTProcessResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -104,21 +104,21 @@ public abstract class BaseCTProcessResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTProcess")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-processes")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-processes")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getCTProcessesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("status")
+ @jakarta.ws.rs.QueryParam("status")
Integer[] status,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -165,31 +165,31 @@ public Page getCTProcessesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTProcess")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/ct-processes/export-batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/ct-processes/export-batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCTProcessesPageExportBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("status")
+ @jakarta.ws.rs.QueryParam("status")
Integer[] status,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.DefaultValue("JSON")
- @javax.ws.rs.QueryParam("contentType")
+ @jakarta.ws.rs.DefaultValue("JSON")
+ @jakarta.ws.rs.QueryParam("contentType")
String contentType,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("fieldNames")
+ @jakarta.ws.rs.QueryParam("fieldNames")
String fieldNames)
throws Exception {
@@ -227,14 +227,14 @@ public Response postCTProcessesPageExportBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTProcess")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/ct-processes/{ctProcessId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/ct-processes/{ctProcessId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteCTProcess(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctProcessId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctProcessId")
Long ctProcessId)
throws Exception {
}
@@ -259,18 +259,18 @@ public void deleteCTProcess(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTProcess")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/ct-processes/{ctProcessId}/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/ct-processes/{ctProcessId}/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteCTProcessBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctProcessId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctProcessId")
Long ctProcessId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -307,14 +307,14 @@ public Response deleteCTProcessBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTProcess")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-processes/{ctProcessId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-processes/{ctProcessId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTProcess getCTProcess(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctProcessId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctProcessId")
Long ctProcessId)
throws Exception {
@@ -345,20 +345,20 @@ public CTProcess getCTProcess(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTProcess")}
)
- @javax.ws.rs.Path("/ct-processes/{ctProcessId}/revert")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/ct-processes/{ctProcessId}/revert")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postCTProcessRevert(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("ctProcessId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("ctProcessId")
Long ctProcessId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("description")
+ @jakarta.ws.rs.QueryParam("description")
String description,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("name")
+ @jakarta.ws.rs.QueryParam("name")
String name)
throws Exception {
}
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTRemoteResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTRemoteResourceImpl.java
index b7be08ffdc40c5..943532ae1fa09f 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTRemoteResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/BaseCTRemoteResourceImpl.java
@@ -39,6 +39,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -48,23 +59,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author David Truong
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCTRemoteResourceImpl
implements CTRemoteResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -98,16 +98,16 @@ public abstract class BaseCTRemoteResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-remotes")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-remotes")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getCTRemotesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -146,26 +146,26 @@ public Page getCTRemotesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/ct-remotes/export-batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/ct-remotes/export-batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCTRemotesPageExportBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.DefaultValue("JSON")
- @javax.ws.rs.QueryParam("contentType")
+ @jakarta.ws.rs.DefaultValue("JSON")
+ @jakarta.ws.rs.QueryParam("contentType")
String contentType,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("fieldNames")
+ @jakarta.ws.rs.QueryParam("fieldNames")
String fieldNames)
throws Exception {
@@ -195,10 +195,10 @@ public Response postCTRemotesPageExportBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/ct-remotes")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/ct-remotes")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTRemote postCTRemote(CTRemote ctRemote) throws Exception {
return new CTRemote();
@@ -220,15 +220,15 @@ public CTRemote postCTRemote(CTRemote ctRemote) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/ct-remotes/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/ct-remotes/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCTRemoteBatch(
CTRemote ctRemote,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -265,13 +265,14 @@ public Response postCTRemoteBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/ct-remotes/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/ct-remotes/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteCTRemote(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -292,14 +293,14 @@ public void deleteCTRemote(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/ct-remotes/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/ct-remotes/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteCTRemoteBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -336,13 +337,14 @@ public Response deleteCTRemoteBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/ct-remotes/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/ct-remotes/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTRemote getCTRemote(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -365,14 +367,15 @@ public CTRemote getCTRemote(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/ct-remotes/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/ct-remotes/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public CTRemote patchCTRemote(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
CTRemote ctRemote)
throws Exception {
@@ -420,14 +423,15 @@ public CTRemote patchCTRemote(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/ct-remotes/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/ct-remotes/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public CTRemote putCTRemote(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
CTRemote ctRemote)
throws Exception {
@@ -451,15 +455,15 @@ public CTRemote putCTRemote(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "CTRemote")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/ct-remotes/batch")
- @javax.ws.rs.Produces("application/json")
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/ct-remotes/batch")
+ @jakarta.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.PUT
@Override
public Response putCTRemoteBatch(
CTRemote ctRemote,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTCollectionResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTCollectionResourceImpl.java
index 674af095e50e6c..893e3e174c9d05 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTCollectionResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTCollectionResourceImpl.java
@@ -39,13 +39,13 @@
import com.liferay.portal.vulcan.pagination.Pagination;
import com.liferay.portal.vulcan.util.SearchUtil;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+
import java.util.Collections;
import java.util.Date;
import java.util.List;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTEntryResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTEntryResourceImpl.java
index c4c4dc32286b07..4f55f775e95f7c 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTEntryResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTEntryResourceImpl.java
@@ -42,9 +42,9 @@
import com.liferay.portal.vulcan.pagination.Pagination;
import com.liferay.portal.vulcan.util.SearchUtil;
-import java.util.Collections;
+import jakarta.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.MultivaluedMap;
+import java.util.Collections;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTProcessResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTProcessResourceImpl.java
index 4d09679a8b5abc..a4fca9f2e286b4 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTProcessResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTProcessResourceImpl.java
@@ -38,9 +38,9 @@
import com.liferay.portal.vulcan.pagination.Pagination;
import com.liferay.portal.vulcan.util.SearchUtil;
-import java.util.Collections;
+import jakarta.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.MultivaluedMap;
+import java.util.Collections;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTRemoteResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTRemoteResourceImpl.java
index c7a2d51eba4835..e60175c92ec4cb 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTRemoteResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/CTRemoteResourceImpl.java
@@ -25,10 +25,10 @@
import com.liferay.portal.vulcan.pagination.Pagination;
import com.liferay.portal.vulcan.util.SearchUtil;
-import java.util.Collections;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
+import java.util.Collections;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/OpenAPIResourceImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
index be3e0708080539..9ed0b5802fb483 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/OpenAPIResourceImpl.java
@@ -11,23 +11,23 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.info.License;
-import java.lang.reflect.Method;
+import jakarta.annotation.Generated;
-import java.util.HashSet;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.annotation.Generated;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.HashSet;
+import java.util.Set;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTCollectionResourceFactoryImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTCollectionResourceFactoryImpl.java
index 26104a07cf4769..00844433e42885 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTCollectionResourceFactoryImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTCollectionResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTEntryResourceFactoryImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTEntryResourceFactoryImpl.java
index 5c027958735fa9..1d1cb2f98cac2b 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTEntryResourceFactoryImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTEntryResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTProcessResourceFactoryImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTProcessResourceFactoryImpl.java
index 945f6fa350d293..2edf8ed8762a7f 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTProcessResourceFactoryImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTProcessResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTRemoteResourceFactoryImpl.java b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTRemoteResourceFactoryImpl.java
index 92016906c36b9e..542794695cab84 100644
--- a/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTRemoteResourceFactoryImpl.java
+++ b/modules/apps/change-tracking/change-tracking-rest-impl/src/main/java/com/liferay/change/tracking/rest/internal/resource/v1_0/factory/CTRemoteResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-rest-test/build.gradle b/modules/apps/change-tracking/change-tracking-rest-test/build.gradle
index 17d4127e39bd3f..9525b7c9dbb02d 100644
--- a/modules/apps/change-tracking/change-tracking-rest-test/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-rest-test/build.gradle
@@ -2,8 +2,8 @@ dependencies {
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
- testIntegrationImplementation group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
+ testIntegrationImplementation group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ testIntegrationImplementation group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
testIntegrationImplementation project(":apps:change-tracking:change-tracking-api")
testIntegrationImplementation project(":apps:change-tracking:change-tracking-rest-api")
testIntegrationImplementation project(":apps:change-tracking:change-tracking-rest-client")
diff --git a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTCollectionResourceTestCase.java b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTCollectionResourceTestCase.java
index 4d54ae5658d6ca..88af619a440de6 100644
--- a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTCollectionResourceTestCase.java
+++ b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTCollectionResourceTestCase.java
@@ -56,6 +56,16 @@
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegateBuilderRegistry;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Method;
import java.net.URI;
@@ -74,16 +84,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTEntryResourceTestCase.java b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTEntryResourceTestCase.java
index 3d1bd78e798de7..a87f73cf88178e 100644
--- a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTEntryResourceTestCase.java
+++ b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTEntryResourceTestCase.java
@@ -56,6 +56,16 @@
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegateBuilderRegistry;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Method;
import java.net.URI;
@@ -74,16 +84,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTProcessResourceTestCase.java b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTProcessResourceTestCase.java
index e064395fda0006..bd1750ff434b59 100644
--- a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTProcessResourceTestCase.java
+++ b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTProcessResourceTestCase.java
@@ -57,6 +57,16 @@
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegateBuilderRegistry;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Method;
import java.net.URI;
@@ -75,16 +85,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTRemoteResourceTestCase.java b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTRemoteResourceTestCase.java
index e54948d93cd35d..5951b6ef14edf8 100644
--- a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTRemoteResourceTestCase.java
+++ b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/BaseCTRemoteResourceTestCase.java
@@ -56,6 +56,16 @@
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegateBuilderRegistry;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Method;
import java.net.URI;
@@ -74,16 +84,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/CTCollectionResourceTest.java b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/CTCollectionResourceTest.java
index 02267ef7e3d0ce..06f20a713f5a8c 100644
--- a/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/CTCollectionResourceTest.java
+++ b/modules/apps/change-tracking/change-tracking-rest-test/src/testIntegration/java/com/liferay/change/tracking/rest/resource/v1_0/test/CTCollectionResourceTest.java
@@ -31,11 +31,11 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.ws.rs.core.Response;
+
import java.util.Date;
import java.util.Map;
-import javax.ws.rs.core.Response;
-
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Rule;
diff --git a/modules/apps/change-tracking/change-tracking-service/build.gradle b/modules/apps/change-tracking/change-tracking-service/build.gradle
index fe4068741de52d..fc499caaf0b985 100644
--- a/modules/apps/change-tracking/change-tracking-service/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-service/build.gradle
@@ -5,11 +5,11 @@ buildService {
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
- compileOnly group: "com.liferay", name: "org.hibernate.core", version: "5.6.7.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "org.hibernate.core", version: "5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/events/CTOnDemandUserPreAction.java b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/events/CTOnDemandUserPreAction.java
index 809636a07d43d2..cbe9f20788cc62 100644
--- a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/events/CTOnDemandUserPreAction.java
+++ b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/events/CTOnDemandUserPreAction.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.security.auth.session.AuthenticatedSessionManagerUtil;
-import java.util.Objects;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/security/auto/login/CTOnDemandUserAutoLogin.java b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/security/auto/login/CTOnDemandUserAutoLogin.java
index c590cd9e37cecb..1c8f5f8ac1ab3d 100644
--- a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/security/auto/login/CTOnDemandUserAutoLogin.java
+++ b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/security/auto/login/CTOnDemandUserAutoLogin.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Objects;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/servlet/filter/CTCollectionPreviewFilter.java b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/servlet/filter/CTCollectionPreviewFilter.java
index 666bbb9895b22b..ff79a845bd9a0b 100644
--- a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/servlet/filter/CTCollectionPreviewFilter.java
+++ b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/servlet/filter/CTCollectionPreviewFilter.java
@@ -24,10 +24,10 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.servlet.filters.BasePortalFilter;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/spi/resolver/PortletPreferencesConstraintResolver.java b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/spi/resolver/PortletPreferencesConstraintResolver.java
index 5e2449e8ed66c6..fb74957202e40f 100644
--- a/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/spi/resolver/PortletPreferencesConstraintResolver.java
+++ b/modules/apps/change-tracking/change-tracking-service/src/main/java/com/liferay/change/tracking/internal/spi/resolver/PortletPreferencesConstraintResolver.java
@@ -62,7 +62,7 @@ public void resolveConflict(
PortletPreferences sourcePortletPreferences =
constraintResolverContext.getSourceCTModel();
- javax.portlet.PortletPreferences jxPortletPreferences =
+ jakarta.portlet.PortletPreferences jxPortletPreferences =
_portletPreferenceValueLocalService.getPreferences(
sourcePortletPreferences);
diff --git a/modules/apps/change-tracking/change-tracking-spi/build.gradle b/modules/apps/change-tracking/change-tracking-spi/build.gradle
index bbefd4e0d7932b..cea6acf2dfa4ba 100644
--- a/modules/apps/change-tracking/change-tracking-spi/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-spi/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:change-tracking:change-tracking-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
diff --git a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/BaseCTDisplayRenderer.java b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/BaseCTDisplayRenderer.java
index 770e7d49f736a7..c45b08370bd0a4 100644
--- a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/BaseCTDisplayRenderer.java
+++ b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/BaseCTDisplayRenderer.java
@@ -21,6 +21,9 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.UncheckedIOException;
import java.io.Writer;
@@ -36,9 +39,6 @@
import java.util.ResourceBundle;
import java.util.function.Function;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Preston Crary
*/
diff --git a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/CTDisplayRenderer.java b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/CTDisplayRenderer.java
index c7d39f2af78986..0c1f9fa072b8d6 100644
--- a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/CTDisplayRenderer.java
+++ b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/CTDisplayRenderer.java
@@ -8,12 +8,12 @@
import com.liferay.change.tracking.spi.display.context.DisplayContext;
import com.liferay.portal.kernel.exception.PortalException;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.InputStream;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* Display renderer used to describe and render models of a given type. If an
* exception occurs during rendering, the default renderer is used instead.
diff --git a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/CTDisplayRendererRegistry.java b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/CTDisplayRendererRegistry.java
index ad40e1c85d12c4..e96a2338ffea06 100644
--- a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/CTDisplayRendererRegistry.java
+++ b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/CTDisplayRendererRegistry.java
@@ -13,14 +13,14 @@
import com.liferay.portal.kernel.model.change.tracking.CTModel;
import com.liferay.portal.kernel.service.change.tracking.CTService;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Pei-Jung Lan
*/
diff --git a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/context/DisplayContext.java b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/context/DisplayContext.java
index 73ed4e8fd1ba4d..ed6b70a37c45dc 100644
--- a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/context/DisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/display/context/DisplayContext.java
@@ -7,10 +7,10 @@
import com.liferay.portal.kernel.model.BaseModel;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/history/util/CTTimelineUtil.java b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/history/util/CTTimelineUtil.java
index 8398601c00ec33..376e1cf2c883a4 100644
--- a/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/history/util/CTTimelineUtil.java
+++ b/modules/apps/change-tracking/change-tracking-spi/src/main/java/com/liferay/change/tracking/spi/history/util/CTTimelineUtil.java
@@ -8,9 +8,9 @@
import com.liferay.change.tracking.spi.constants.CTTimelineKeys;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Cheryl Tang
diff --git a/modules/apps/change-tracking/change-tracking-test/build.gradle b/modules/apps/change-tracking/change-tracking-test/build.gradle
index 0749867bf4af9c..51ae9e843ba3ae 100644
--- a/modules/apps/change-tracking/change-tracking-test/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-test/build.gradle
@@ -1,5 +1,5 @@
dependencies {
- testIntegrationImplementation group: "com.liferay", name: "org.hibernate.core", version: "5.6.7.LIFERAY-PATCHED-2"
+ testIntegrationImplementation group: "com.liferay", name: "org.hibernate.core", version: "5.6.7.LIFERAY-PATCHED-2.JAKARTA_LIFERAY-PATCHED-1"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
testIntegrationImplementation group: "org.osgi", name: "osgi.core", version: "6.0.0"
testIntegrationImplementation project(":apps:blogs:blogs-api")
diff --git a/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/conflict/test/PortletPreferencesConflictTest.java b/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/conflict/test/PortletPreferencesConflictTest.java
index c55b26cfe43587..32306a8cc74f75 100644
--- a/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/conflict/test/PortletPreferencesConflictTest.java
+++ b/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/conflict/test/PortletPreferencesConflictTest.java
@@ -69,7 +69,7 @@ public void setUp() throws Exception {
@Test
public void testResolvePortletPreferencesConflictTest() throws Exception {
- javax.portlet.PortletPreferences jxPortletPreferences = null;
+ jakarta.portlet.PortletPreferences jxPortletPreferences = null;
try (SafeCloseable safeCloseable =
CTCollectionThreadLocal.setCTCollectionIdWithSafeCloseable(
@@ -126,7 +126,7 @@ public void testResolvePortletPreferencesConflictTest() throws Exception {
_ctProcessLocalService.addCTProcess(
_ctCollection2.getUserId(), _ctCollection2.getCtCollectionId());
- javax.portlet.PortletPreferences publishedJavaxPortletPreferences =
+ jakarta.portlet.PortletPreferences publishedJavaxPortletPreferences =
_portletPreferencesLocalService.getPreferences(
TestPropsValues.getCompanyId(),
PortletKeys.PREFS_OWNER_ID_DEFAULT,
@@ -181,7 +181,7 @@ public void testResolvePortletPreferenceValueConflictTest()
PortletKeys.PREFS_OWNER_TYPE_LAYOUT, _layout.getPlid(),
_portlet.getPortletId(), _portlet, null);
- javax.portlet.PortletPreferences jxPortletPreferences =
+ jakarta.portlet.PortletPreferences jxPortletPreferences =
_portletPreferenceValueLocalService.getPreferences(
portletPreferences);
@@ -231,7 +231,7 @@ public void testResolvePortletPreferenceValueConflictTest()
_ctProcessLocalService.addCTProcess(
_ctCollection2.getUserId(), _ctCollection2.getCtCollectionId());
- javax.portlet.PortletPreferences publishedJavaxPortletPreferences =
+ jakarta.portlet.PortletPreferences publishedJavaxPortletPreferences =
_portletPreferencesLocalService.getPreferences(
TestPropsValues.getCompanyId(),
PortletKeys.PREFS_OWNER_ID_DEFAULT,
diff --git a/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/dispatch/executor/test/CTConflictCheckerDispatchTaskExecutorTest.java b/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/dispatch/executor/test/CTConflictCheckerDispatchTaskExecutorTest.java
index 02852f6bea7db8..c0b1b35ee534ea 100644
--- a/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/dispatch/executor/test/CTConflictCheckerDispatchTaskExecutorTest.java
+++ b/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/dispatch/executor/test/CTConflictCheckerDispatchTaskExecutorTest.java
@@ -183,7 +183,7 @@ private void _simulateSchedulerEvent(long dispatchTriggerId)
private UserNotificationEventLocalService
_userNotificationEventLocalService;
- @Inject(filter = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS)
+ @Inject(filter = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS)
private UserNotificationHandler _userNotificationHandler;
}
\ No newline at end of file
diff --git a/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/portlet/action/test/InviteUsersMVCResourceCommandTest.java b/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/portlet/action/test/InviteUsersMVCResourceCommandTest.java
index 1ff63bf263390b..48933919a3a324 100644
--- a/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/portlet/action/test/InviteUsersMVCResourceCommandTest.java
+++ b/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/portlet/action/test/InviteUsersMVCResourceCommandTest.java
@@ -39,7 +39,7 @@
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
import com.liferay.portal.test.rule.SynchronousMailTestRule;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/test/PublicationUserNotificationHandlerTest.java b/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/test/PublicationUserNotificationHandlerTest.java
index cf9926edde37b9..06bf269dcd97b1 100644
--- a/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/test/PublicationUserNotificationHandlerTest.java
+++ b/modules/apps/change-tracking/change-tracking-test/src/testIntegration/java/com/liferay/change/tracking/internal/test/PublicationUserNotificationHandlerTest.java
@@ -47,12 +47,12 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.portlet.PortletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -480,7 +480,7 @@ private Bundle _stopJournalServiceBundle() throws Exception {
private UserNotificationEventLocalService
_userNotificationEventLocalService;
- @Inject(filter = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS)
+ @Inject(filter = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS)
private UserNotificationHandler _userNotificationHandler;
}
\ No newline at end of file
diff --git a/modules/apps/change-tracking/change-tracking-web/build.gradle b/modules/apps/change-tracking/change-tracking-web/build.gradle
index 09ad0b29b11aaf..239f64384ba09b 100644
--- a/modules/apps/change-tracking/change-tracking-web/build.gradle
+++ b/modules/apps/change-tracking/change-tracking-web/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
compileOnly group: "com.liferay", name: "org.springframework.tx", version: "5.3.39.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/application/list/PublicationsPanelApp.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/application/list/PublicationsPanelApp.java
index 211ffff2ca932b..8597a52aa14c07 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/application/list/PublicationsPanelApp.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/application/list/PublicationsPanelApp.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -90,7 +90,7 @@ public boolean isShow(PermissionChecker permissionChecker, Group group)
private CTSettingsConfigurationHelper _ctSettingsConfigurationHelper;
@Reference(
- target = "(javax.portlet.name=" + CTPortletKeys.PUBLICATIONS + ")"
+ target = "(jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/CTDisplayRendererRegistryImpl.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/CTDisplayRendererRegistryImpl.java
index a0ceb3eb01ab83..33210d42a362f7 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/CTDisplayRendererRegistryImpl.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/CTDisplayRendererRegistryImpl.java
@@ -39,6 +39,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.Date;
@@ -46,8 +48,6 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/DisplayContextImpl.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/DisplayContextImpl.java
index d3a56ececea2bb..5b050c2fbbfe08 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/DisplayContextImpl.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/DisplayContextImpl.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Preston Crary
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/BasePublicationsDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/BasePublicationsDisplayContext.java
index 80f64a08947a60..22ec54549058a0 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/BasePublicationsDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/BasePublicationsDisplayContext.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.ConcurrentModificationException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ConcurrentModificationException;
/**
* @author Samuel Trong Tran
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/PublicationsConfigurationDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/PublicationsConfigurationDisplayContext.java
index ca37b51a54eb5f..0e6ac65f059765 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/PublicationsConfigurationDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/PublicationsConfigurationDisplayContext.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Máté Thurzó
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/PublicationsDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/PublicationsDisplayContext.java
index 6c4e1d5b77fa98..15bcbf6c69eb6a 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/PublicationsDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/PublicationsDisplayContext.java
@@ -38,15 +38,15 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.util.PropsValues;
-import java.util.List;
-import java.util.Map;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
/**
* @author Samuel Trong Tran
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ReschedulePublicationDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ReschedulePublicationDisplayContext.java
index d12ca13f2fbb3a..4c737aa241e7f3 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ReschedulePublicationDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ReschedulePublicationDisplayContext.java
@@ -19,15 +19,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Calendar;
import java.util.Map;
import java.util.TimeZone;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Samuel Trong Tran
*/
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewCTRemotesDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewCTRemotesDisplayContext.java
index 6f6d20b8e35839..a38b8eb7ff6d8e 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewCTRemotesDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewCTRemotesDisplayContext.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author David Truong
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewChangesDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewChangesDisplayContext.java
index 2a1700a0121b6a..1c98dbadb3606b 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewChangesDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewChangesDisplayContext.java
@@ -106,6 +106,14 @@
import com.liferay.portal.search.sort.Sorts;
import com.liferay.portal.util.PropsValues;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.text.Format;
@@ -125,14 +133,6 @@
import java.util.Queue;
import java.util.Set;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Samuel Trong Tran
*/
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewConflictsDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewConflictsDisplayContext.java
index 302428f4231360..520c34e8bfe971 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewConflictsDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewConflictsDisplayContext.java
@@ -43,19 +43,19 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.ResourceBundle;
import java.util.TimeZone;
-import javax.portlet.ActionRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Samuel Trong Tran
*/
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewHistoryDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewHistoryDisplayContext.java
index d81b6fbfb6963a..c8612eb3a65219 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewHistoryDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewHistoryDisplayContext.java
@@ -15,12 +15,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.util.PropsValues;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Samuel Trong Tran
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewRelatedEntriesDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewRelatedEntriesDisplayContext.java
index 44ad76c6474a8b..6462117d0ae289 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewRelatedEntriesDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewRelatedEntriesDisplayContext.java
@@ -34,6 +34,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.ResourceURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -42,12 +48,6 @@
import java.util.Map;
import java.util.Set;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Samuel Trong Tran
*/
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewScheduledDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewScheduledDisplayContext.java
index d68341a5ad457e..09101df92497a6 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewScheduledDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewScheduledDisplayContext.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.util.PropsValues;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Samuel Trong Tran
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTemplatesDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTemplatesDisplayContext.java
index 4cb546991ba4b0..50178294c7258f 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTemplatesDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTemplatesDisplayContext.java
@@ -21,13 +21,13 @@
import com.liferay.portal.kernel.util.OrderByComparatorFactoryUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
-import java.util.Objects;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+import java.util.Objects;
/**
* @author David Truong
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTemplatesManagementToolbarDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTemplatesManagementToolbarDisplayContext.java
index 082c0e1966118a..1defc022c010e2 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTemplatesManagementToolbarDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTemplatesManagementToolbarDisplayContext.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author David Truong
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTimelineHistoryDisplayContext.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTimelineHistoryDisplayContext.java
index 31c2a051d27688..329457d7cfc84d 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTimelineHistoryDisplayContext.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/display/context/ViewTimelineHistoryDisplayContext.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Cheryl Tang
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/events/SandboxServicePreAction.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/events/SandboxServicePreAction.java
index 6bf6cf38a09eef..ad68aed9f3dc5e 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/events/SandboxServicePreAction.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/events/SandboxServicePreAction.java
@@ -20,8 +20,8 @@
import com.liferay.portal.kernel.service.permission.PortletPermissionUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/helper/PublicationHelper.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/helper/PublicationHelper.java
index 8824bc3188f776..19ad8f0bc499e0 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/helper/PublicationHelper.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/helper/PublicationHelper.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.model.Ticket;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/instance/lifecycle/CTPortletPermissionPortalInstanceLifecycleListener.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/instance/lifecycle/CTPortletPermissionPortalInstanceLifecycleListener.java
index ddfb5932071981..a7ad0c631514ef 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/instance/lifecycle/CTPortletPermissionPortalInstanceLifecycleListener.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/instance/lifecycle/CTPortletPermissionPortalInstanceLifecycleListener.java
@@ -137,7 +137,7 @@ private void _checkPublicationsUserRole(long companyId) throws Exception {
CTPortletPermissionPortalInstanceLifecycleListener.class);
@Reference(
- target = "(javax.portlet.name=" + CTPortletKeys.PUBLICATIONS + ")"
+ target = "(jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/model/listener/RoleModelListener.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/model/listener/RoleModelListener.java
index 9974ebfdf79e5b..edc63d7b3e2aaa 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/model/listener/RoleModelListener.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/model/listener/RoleModelListener.java
@@ -76,7 +76,7 @@ public void onAfterCreate(Role role) throws ModelListenerException {
RoleModelListener.class);
@Reference(
- target = "(javax.portlet.name=" + CTPortletKeys.PUBLICATIONS + ")"
+ target = "(jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationChangeSizeClassificationUserNotificationDefinition.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationChangeSizeClassificationUserNotificationDefinition.java
index a3d1602bb40e19..b17cb8b54539c1 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationChangeSizeClassificationUserNotificationDefinition.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationChangeSizeClassificationUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Gislayne Vitorino
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = UserNotificationDefinition.class
)
public class PublicationChangeSizeClassificationUserNotificationDefinition
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationChangeSizeClassificationUserNotificationHandler.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationChangeSizeClassificationUserNotificationHandler.java
index b3febe20c06923..bcc170bb56efa8 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationChangeSizeClassificationUserNotificationHandler.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationChangeSizeClassificationUserNotificationHandler.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationInviteUserNotificationDefinition.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationInviteUserNotificationDefinition.java
index a8503a48dd7b6c..d91a5387594787 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationInviteUserNotificationDefinition.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationInviteUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Samuel Trong Tran
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = UserNotificationDefinition.class
)
public class PublicationInviteUserNotificationDefinition
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationInviteUserNotificationHandler.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationInviteUserNotificationHandler.java
index 1423510a39e822..6bf1ef5ef13acf 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationInviteUserNotificationHandler.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationInviteUserNotificationHandler.java
@@ -27,7 +27,7 @@
import com.liferay.portal.kernel.util.HtmlUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationsUserNotificationHandler.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationsUserNotificationHandler.java
index e4b9dde1f56353..399ecc938fd165 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationsUserNotificationHandler.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/PublicationsUserNotificationHandler.java
@@ -26,7 +26,7 @@
* @author Pei-Jung Lan
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = UserNotificationHandler.class
)
public class PublicationsUserNotificationHandler
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/ScheduledPublicationUserNotificationDefinition.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/ScheduledPublicationUserNotificationDefinition.java
index 967fa9f2d03347..53f0a8e898205a 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/ScheduledPublicationUserNotificationDefinition.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/ScheduledPublicationUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Brooke Dalton
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = UserNotificationDefinition.class
)
public class ScheduledPublicationUserNotificationDefinition
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/ScheduledPublicationUserNotificationHandler.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/ScheduledPublicationUserNotificationHandler.java
index a2fe30a848a183..30e954adcc51ed 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/ScheduledPublicationUserNotificationHandler.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/notifications/ScheduledPublicationUserNotificationHandler.java
@@ -23,7 +23,7 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/PublicationsPortlet.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/PublicationsPortlet.java
index bed73d79e559f1..ce92b26ced15d9 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/PublicationsPortlet.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/PublicationsPortlet.java
@@ -25,14 +25,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.io.IOException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -52,14 +52,14 @@
"com.liferay.portlet.show-portlet-inactive=false",
"com.liferay.portlet.system=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Overview",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/publications/view_publications.jsp",
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Overview",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/publications/view_publications.jsp",
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/AutocompleteUserMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/AutocompleteUserMVCResourceCommand.java
index 476117d45fc7ca..fa4f0b07e4c5ff 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/AutocompleteUserMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/AutocompleteUserMVCResourceCommand.java
@@ -40,15 +40,15 @@
import com.liferay.portal.kernel.util.comparator.UserScreenNameComparator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.io.IOException;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -57,7 +57,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/autocomplete_user"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/CheckoutCTCollectionMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/CheckoutCTCollectionMVCActionCommand.java
index b2dab99142deef..eb004bcb686fc4 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/CheckoutCTCollectionMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/CheckoutCTCollectionMVCActionCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/checkout_ct_collection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTAutoResolutionInfoMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTAutoResolutionInfoMVCActionCommand.java
index a14bf16cb94bf4..e1395bd3fdf455 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTAutoResolutionInfoMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTAutoResolutionInfoMVCActionCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/delete_ct_auto_resolution_info"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCollectionMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCollectionMVCActionCommand.java
index 8f945fcd90edb7..11f6e89e0314ca 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCollectionMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCollectionMVCActionCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/delete_ct_collection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCollectionTemplateMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCollectionTemplateMVCActionCommand.java
index 1deeaaa8f2703d..97507ab25ec042 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCollectionTemplateMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCollectionTemplateMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/delete_ct_collection_template"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCommentMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCommentMVCResourceCommand.java
index 6ecc035e1d1322..0a44e29316dd2d 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCommentMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DeleteCTCommentMVCResourceCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/delete_ct_comment"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DiscardChangesMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DiscardChangesMVCActionCommand.java
index dc347c5fca1447..5bdfcd14f0b15c 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DiscardChangesMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/DiscardChangesMVCActionCommand.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/discard_changes"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionMVCActionCommand.java
index e40f3b65694317..6658dff0410237 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionMVCActionCommand.java
@@ -25,10 +25,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/edit_ct_collection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionMVCRenderCommand.java
index b5391db7ed7b56..a046b74cd58980 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionMVCRenderCommand.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/add_ct_collection",
"mvc.command.name=/change_tracking/edit_ct_collection",
"mvc.command.name=/change_tracking/undo_ct_collection"
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionTemplateMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionTemplateMVCActionCommand.java
index 867a1c772bde80..c4daadb0f80ef0 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionTemplateMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionTemplateMVCActionCommand.java
@@ -20,10 +20,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.io.IOException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/edit_ct_collection_template"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionTemplateMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionTemplateMVCRenderCommand.java
index 0c1120d8fbe580..b7cf6b1e8c548c 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionTemplateMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTCollectionTemplateMVCRenderCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/edit_ct_collection_template"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTRemoteMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTRemoteMVCActionCommand.java
index 5fcc851dbb0b52..e4b4e9c502ca32 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTRemoteMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTRemoteMVCActionCommand.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.io.IOException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/edit_ct_remote"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTRemoteMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTRemoteMVCRenderCommand.java
index bb6a17eff6df58..3c8f484fafe148 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTRemoteMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/EditCTRemoteMVCRenderCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/edit_ct_remote"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetCTCommentsMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetCTCommentsMVCResourceCommand.java
index 64ce5c3056153c..8361a34a384d24 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetCTCommentsMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetCTCommentsMVCResourceCommand.java
@@ -28,6 +28,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.text.Format;
import java.util.Collections;
@@ -35,9 +38,6 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,7 +46,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/get_ct_comments"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetCollaboratorsMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetCollaboratorsMVCResourceCommand.java
index 034e501810c57e..8464d72f5bb83c 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetCollaboratorsMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetCollaboratorsMVCResourceCommand.java
@@ -37,17 +37,17 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -56,7 +56,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/get_collaborators"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetConflictInfoMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetConflictInfoMVCResourceCommand.java
index e19765119d1c45..2b8dc10343842a 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetConflictInfoMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetConflictInfoMVCResourceCommand.java
@@ -31,12 +31,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.util.List;
import java.util.Map;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,7 +45,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/get_conflict_info"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetEntryRenderDataMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetEntryRenderDataMVCResourceCommand.java
index dcc738d1f12468..032258e91a25b3 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetEntryRenderDataMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetEntryRenderDataMVCResourceCommand.java
@@ -88,6 +88,14 @@
import com.liferay.segments.service.SegmentsEntryLocalService;
import com.liferay.segments.service.SegmentsExperienceLocalService;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.text.Format;
import java.util.ArrayList;
@@ -99,14 +107,6 @@
import java.util.Objects;
import java.util.function.Function;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -115,7 +115,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/get_entry_render_data"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetPublicationStatusMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetPublicationStatusMVCResourceCommand.java
index 447ff3566fba55..c404336dd1afb1 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetPublicationStatusMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetPublicationStatusMVCResourceCommand.java
@@ -24,16 +24,16 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.Map;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,7 +42,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/get_publication_status"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetSelectPublicationsMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetSelectPublicationsMVCResourceCommand.java
index 44a842c056dbec..56471b644288b3 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetSelectPublicationsMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetSelectPublicationsMVCResourceCommand.java
@@ -31,15 +31,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.portlet.ActionRequest;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -48,7 +48,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/get_select_publications"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetSharePublicationLinkMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetSharePublicationLinkMVCResourceCommand.java
index 7a7659dbd9b306..08c17b24b6608c 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetSharePublicationLinkMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetSharePublicationLinkMVCResourceCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCResourceCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/get_share_publication_link"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetTemplateCollaboratorsMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetTemplateCollaboratorsMVCResourceCommand.java
index 515d637425c724..df015730c3bd8f 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetTemplateCollaboratorsMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/GetTemplateCollaboratorsMVCResourceCommand.java
@@ -26,8 +26,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/get_template_collaborators"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/InviteUsersMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/InviteUsersMVCResourceCommand.java
index f14c8e216ab78e..776efda62dbf5e 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/InviteUsersMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/InviteUsersMVCResourceCommand.java
@@ -55,6 +55,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.HashMap;
@@ -62,13 +69,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -77,7 +77,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/invite_users"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ManageCollaboratorsMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ManageCollaboratorsMVCRenderCommand.java
index 77391bc91a744e..61fd3da387d6f5 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ManageCollaboratorsMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ManageCollaboratorsMVCRenderCommand.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/manage_collaborators"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/MoveChangesMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/MoveChangesMVCActionCommand.java
index eb36fc7d965b06..aa01b119ffdf8c 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/MoveChangesMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/MoveChangesMVCActionCommand.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/move_changes"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/PublishCTCollectionMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/PublishCTCollectionMVCActionCommand.java
index 1df1074a5f3b8a..f5134ee486a10a 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/PublishCTCollectionMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/PublishCTCollectionMVCActionCommand.java
@@ -30,9 +30,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,7 +42,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/publish_ct_collection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ReactivateCTCollectionMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ReactivateCTCollectionMVCActionCommand.java
index 5feaef767ec4ec..520f9448d25d27 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ReactivateCTCollectionMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ReactivateCTCollectionMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/reactivate_ct_collection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ReschedulePublicationMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ReschedulePublicationMVCRenderCommand.java
index 64c490dc979ba3..c559403d57ef56 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ReschedulePublicationMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ReschedulePublicationMVCRenderCommand.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/reschedule_publication"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/RestoreTrashEntriesMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/RestoreTrashEntriesMVCActionCommand.java
index 292ebf04ac599c..328cef1223488b 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/RestoreTrashEntriesMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/RestoreTrashEntriesMVCActionCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.trash.service.TrashEntryService;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/restore_trash_entries"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/SaveDisplayPreferenceMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/SaveDisplayPreferenceMVCResourceCommand.java
index d14e0309da7774..92cd0cc15520c1 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/SaveDisplayPreferenceMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/SaveDisplayPreferenceMVCResourceCommand.java
@@ -13,12 +13,12 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.util.Objects;
import java.util.concurrent.TimeUnit;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
/**
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/save_display_preference"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/SchedulePublicationMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/SchedulePublicationMVCActionCommand.java
index aff7f5f03de14b..416ec0c5e92c89 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/SchedulePublicationMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/SchedulePublicationMVCActionCommand.java
@@ -20,10 +20,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Date;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Date;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/reschedule_publication",
"mvc.command.name=/change_tracking/schedule_publication"
},
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UndoCTCollectionMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UndoCTCollectionMVCActionCommand.java
index 98f8f2182717b5..deb337068c36ab 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UndoCTCollectionMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UndoCTCollectionMVCActionCommand.java
@@ -24,10 +24,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/undo_ct_collection"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UnschedulePublicationMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UnschedulePublicationMVCActionCommand.java
index aa682d9510cdd6..b8de74e1a2a566 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UnschedulePublicationMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UnschedulePublicationMVCActionCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/unschedule_publication"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UpdateCTCommentMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UpdateCTCommentMVCResourceCommand.java
index b7f7b574533040..410218ce28cb68 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UpdateCTCommentMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UpdateCTCommentMVCResourceCommand.java
@@ -25,8 +25,8 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/update_ct_comment"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UpdateGlobalPublicationsConfigurationMVCActionCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UpdateGlobalPublicationsConfigurationMVCActionCommand.java
index 12f7e74cd91018..bdce89afc0d38c 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UpdateGlobalPublicationsConfigurationMVCActionCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/UpdateGlobalPublicationsConfigurationMVCActionCommand.java
@@ -22,10 +22,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/update_global_publications_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/VerifyEmailAddressMVCResourceCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/VerifyEmailAddressMVCResourceCommand.java
index e02640ff4739cc..321c120cfbd6f1 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/VerifyEmailAddressMVCResourceCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/VerifyEmailAddressMVCResourceCommand.java
@@ -27,10 +27,10 @@
import com.liferay.portal.kernel.util.PortletKeys;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/verify_email_address"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewCTCollectionTemplatesMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewCTCollectionTemplatesMVCRenderCommand.java
index 067d95701060e3..bd4e8b412444ff 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewCTCollectionTemplatesMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewCTCollectionTemplatesMVCRenderCommand.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_ct_collection_templates"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewCTRemotesMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewCTRemotesMVCRenderCommand.java
index 97e01f5a5e5bab..0ccb0da8de3803 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewCTRemotesMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewCTRemotesMVCRenderCommand.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_ct_remotes"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewChangeMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewChangeMVCRenderCommand.java
index 7616d3719639ef..810865c605a229 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewChangeMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewChangeMVCRenderCommand.java
@@ -43,8 +43,8 @@
import com.liferay.portal.kernel.workflow.WorkflowTaskManager;
import com.liferay.portlet.LiferayPortletUtil;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -54,7 +54,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_change"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewChangesMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewChangesMVCRenderCommand.java
index fc4ec393a50371..0ccffa15254b03 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewChangesMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewChangesMVCRenderCommand.java
@@ -40,10 +40,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowTaskManager;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -53,7 +53,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_changes"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewConflictsMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewConflictsMVCRenderCommand.java
index 0bb2a277effb66..cf2aca800ecedc 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewConflictsMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewConflictsMVCRenderCommand.java
@@ -29,6 +29,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.sql.SQLException;
@@ -36,12 +42,6 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_conflicts"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewDiscardMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewDiscardMVCRenderCommand.java
index 4b020be3f1b761..6805278b04673f 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewDiscardMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewDiscardMVCRenderCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.service.UserLocalService;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_discard"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewHistoryMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewHistoryMVCRenderCommand.java
index 8c618fb7d405fc..1ba4598c4e221f 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewHistoryMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewHistoryMVCRenderCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_history"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewMoveChangesMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewMoveChangesMVCRenderCommand.java
index e5c726ab2c734f..4d44c3b0b9882f 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewMoveChangesMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewMoveChangesMVCRenderCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.service.UserLocalService;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_move_changes"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewPublicationsMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewPublicationsMVCRenderCommand.java
index 423952f355d86a..2b33e48d130800 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewPublicationsMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewPublicationsMVCRenderCommand.java
@@ -8,8 +8,8 @@
import com.liferay.change.tracking.constants.CTPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -18,7 +18,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/",
"mvc.command.name=/change_tracking/view_publications"
},
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewScheduledMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewScheduledMVCRenderCommand.java
index 0707944b320429..0b06eb9783d166 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewScheduledMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewScheduledMVCRenderCommand.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_scheduled"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewSettingsMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewSettingsMVCRenderCommand.java
index f98ce792f892e3..b3c42ffb9b581d 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewSettingsMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewSettingsMVCRenderCommand.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.service.permission.PortletPermissionUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_settings"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewStackTraceMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewStackTraceMVCRenderCommand.java
index f0136d889296d0..d0124832f3efb0 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewStackTraceMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewStackTraceMVCRenderCommand.java
@@ -8,8 +8,8 @@
import com.liferay.change.tracking.constants.CTPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -18,7 +18,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_stack_trace"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewTimelineHistoryMVCRenderCommand.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewTimelineHistoryMVCRenderCommand.java
index 63f63ca1ac19f1..d5897b88968671 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewTimelineHistoryMVCRenderCommand.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/action/ViewTimelineHistoryMVCRenderCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"mvc.command.name=/change_tracking/view_timeline_history"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTCollectionTemplatesPortletConfigurationIcon.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTCollectionTemplatesPortletConfigurationIcon.java
index 8e1995c8dc58ec..7249c074d6f212 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTCollectionTemplatesPortletConfigurationIcon.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTCollectionTemplatesPortletConfigurationIcon.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
* @author Samuel Trong Tran
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = PortletConfigurationIcon.class
)
public class CTCollectionTemplatesPortletConfigurationIcon
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTNotificationsPortletConfigurationIcon.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTNotificationsPortletConfigurationIcon.java
index 567ebcf8d178a9..7a64221cb5a19e 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTNotificationsPortletConfigurationIcon.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTNotificationsPortletConfigurationIcon.java
@@ -16,13 +16,13 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.HashMapBuilder;
-import java.util.Map;
-import java.util.Objects;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.ResourceURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.ResourceURL;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Map;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
* @author Gislayne Vitorino
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = PortletConfigurationIcon.class
)
public class CTNotificationsPortletConfigurationIcon
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTRemotesPortletConfigurationIcon.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTRemotesPortletConfigurationIcon.java
index 033bd41c521368..58cc958aa7fbae 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTRemotesPortletConfigurationIcon.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/CTRemotesPortletConfigurationIcon.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
* @author Samuel Trong Tran
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = PortletConfigurationIcon.class
)
public class CTRemotesPortletConfigurationIcon
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/DataCleanUpPortletConfigurationIcon.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/DataCleanUpPortletConfigurationIcon.java
index 1abd7e94f631f1..a1ef5b9c738e40 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/DataCleanUpPortletConfigurationIcon.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/DataCleanUpPortletConfigurationIcon.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
"path=/change_tracking/view_history"
},
service = PortletConfigurationIcon.class
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
index 82c6de9435c43b..f6b7ead8148cef 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/PermissionsPortletConfigurationIcon.java
@@ -21,8 +21,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.security.PermissionsURLTag;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
* @author Preston Crary
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = PortletConfigurationIcon.class
)
public class PermissionsPortletConfigurationIcon
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/SettingsPortletConfigurationIcon.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/SettingsPortletConfigurationIcon.java
index e97f340a842b7e..d33f4c460329a9 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/SettingsPortletConfigurationIcon.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/portlet/configuration/icon/SettingsPortletConfigurationIcon.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.service.permission.PortletPermissionUtil;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
* @author Samuel Trong Tran
*/
@Component(
- property = "javax.portlet.name=" + CTPortletKeys.PUBLICATIONS,
+ property = "jakarta.portlet.name=" + CTPortletKeys.PUBLICATIONS,
service = PortletConfigurationIcon.class
)
public class SettingsPortletConfigurationIcon
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/CTDocumentServlet.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/CTDocumentServlet.java
index 0a469acafe7233..d58a222ceafed7 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/CTDocumentServlet.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/CTDocumentServlet.java
@@ -41,18 +41,18 @@
import com.liferay.portal.kernel.util.URLCodec;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/CTReviewChangesServlet.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/CTReviewChangesServlet.java
index 6daa6dbe8e5a42..6c6a2574ee99d1 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/CTReviewChangesServlet.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/CTReviewChangesServlet.java
@@ -20,13 +20,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.io.IOException;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/BaseCTExceptionDynamicInclude.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/BaseCTExceptionDynamicInclude.java
index 5e1683adbd84e0..942b267d955d86 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/BaseCTExceptionDynamicInclude.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/BaseCTExceptionDynamicInclude.java
@@ -10,16 +10,16 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.taglib.aui.ScriptTag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+
import java.io.IOException;
import java.io.Writer;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
import org.osgi.service.component.annotations.Reference;
/**
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTPreviewIndicatorDynamicInclude.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTPreviewIndicatorDynamicInclude.java
index a3834921845239..6fa11d36f739db 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTPreviewIndicatorDynamicInclude.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTPreviewIndicatorDynamicInclude.java
@@ -35,16 +35,16 @@
import com.liferay.portal.template.react.renderer.ReactRenderer;
import com.liferay.taglib.util.HtmlTopTag;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+
import java.io.IOException;
import java.io.Writer;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTRequiredModelExceptionDynamicInclude.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTRequiredModelExceptionDynamicInclude.java
index 010376f113a4ef..e379a4cca4ab3f 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTRequiredModelExceptionDynamicInclude.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTRequiredModelExceptionDynamicInclude.java
@@ -10,13 +10,13 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTTransactionExceptionDynamicInclude.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTTransactionExceptionDynamicInclude.java
index 5e4dfd4444f2c4..b961695569dd55 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTTransactionExceptionDynamicInclude.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/CTTransactionExceptionDynamicInclude.java
@@ -10,13 +10,13 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/ChangeTrackingIndicatorDynamicInclude.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/ChangeTrackingIndicatorDynamicInclude.java
index 506ea82039e1ee..36fc02bfebef8b 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/ChangeTrackingIndicatorDynamicInclude.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/servlet/taglib/ChangeTrackingIndicatorDynamicInclude.java
@@ -65,6 +65,16 @@
import com.liferay.portal.template.react.renderer.ReactRenderer;
import com.liferay.taglib.util.HtmlTopTag;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.ResourceURL;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+
import java.io.IOException;
import java.io.Writer;
@@ -72,16 +82,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.ResourceURL;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/spi/display/PortletPreferencesCTDisplayRenderer.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/spi/display/PortletPreferencesCTDisplayRenderer.java
index 17d561298a6c0c..51b0cf36f82c10 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/spi/display/PortletPreferencesCTDisplayRenderer.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/spi/display/PortletPreferencesCTDisplayRenderer.java
@@ -138,7 +138,7 @@ protected void buildDisplay(
).display(
"preferences",
() -> {
- javax.portlet.PortletPreferences jxPortletPreferences =
+ jakarta.portlet.PortletPreferences jxPortletPreferences =
_portletPreferenceValueLocalService.getPreferences(
portletPreferences);
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/template/ChangeTrackingTemplateContextContributor.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/template/ChangeTrackingTemplateContextContributor.java
index 5400dfa9839ba4..613a908c0ea4fe 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/template/ChangeTrackingTemplateContextContributor.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/template/ChangeTrackingTemplateContextContributor.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/util/PublicationsPortletURLUtil.java b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/util/PublicationsPortletURLUtil.java
index 1ee54301800776..0b6ca7844fbc96 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/util/PublicationsPortletURLUtil.java
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/java/com/liferay/change/tracking/web/internal/util/PublicationsPortletURLUtil.java
@@ -14,13 +14,13 @@
import com.liferay.portal.kernel.util.HtmlUtil;
import com.liferay.taglib.security.PermissionsURLTag;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Samuel Trong Tran
diff --git a/modules/apps/change-tracking/change-tracking-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/change-tracking/change-tracking-web/src/main/resources/META-INF/resources/init.jsp
index bbefe1226c5242..5e2af0fa7df731 100644
--- a/modules/apps/change-tracking/change-tracking-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/change-tracking/change-tracking-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -64,11 +64,11 @@ page import="com.liferay.portal.kernel.util.ParamUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %>
+<%@ page import="jakarta.portlet.RenderResponse" %>
+
<%@ page import="java.util.Date" %><%@
page import="java.util.Objects" %>
-<%@ page import="javax.portlet.RenderResponse" %>
-
diff --git a/modules/apps/click-to-chat/click-to-chat-test/src/testIntegration/java/com/liferay/click/to/chat/web/internal/events/test/LogoutPreActionTest.java b/modules/apps/click-to-chat/click-to-chat-test/src/testIntegration/java/com/liferay/click/to/chat/web/internal/events/test/LogoutPreActionTest.java
index 4649d010d9c1d8..9a5bbfcbc67ac9 100644
--- a/modules/apps/click-to-chat/click-to-chat-test/src/testIntegration/java/com/liferay/click/to/chat/web/internal/events/test/LogoutPreActionTest.java
+++ b/modules/apps/click-to-chat/click-to-chat-test/src/testIntegration/java/com/liferay/click/to/chat/web/internal/events/test/LogoutPreActionTest.java
@@ -20,7 +20,7 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.Cookie;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/click-to-chat/click-to-chat-web/build.gradle b/modules/apps/click-to-chat/click-to-chat-web/build.gradle
index de81fc2ffe32e4..c1d438bc0fbe11 100644
--- a/modules/apps/click-to-chat/click-to-chat-web/build.gradle
+++ b/modules/apps/click-to-chat/click-to-chat-web/build.gradle
@@ -3,10 +3,10 @@ dependencies {
compileInclude group: "io.jsonwebtoken", name: "jjwt-impl", version: "0.11.2"
compileInclude group: "io.jsonwebtoken", name: "jjwt-jackson", version: "0.11.2"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:configuration-admin:configuration-admin-api")
diff --git a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/configuration/admin/display/ClickToChatPortalSettingsConfigurationScreenWrapper.java b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/configuration/admin/display/ClickToChatPortalSettingsConfigurationScreenWrapper.java
index 1bcfdb78d87e61..5854d4c9d50ee5 100644
--- a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/configuration/admin/display/ClickToChatPortalSettingsConfigurationScreenWrapper.java
+++ b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/configuration/admin/display/ClickToChatPortalSettingsConfigurationScreenWrapper.java
@@ -16,11 +16,11 @@
import com.liferay.portal.settings.configuration.admin.display.PortalSettingsConfigurationScreenContributor;
import com.liferay.portal.settings.configuration.admin.display.PortalSettingsConfigurationScreenFactory;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/configuration/admin/display/ClickToChatSiteSettingsConfigurationScreenWrapper.java b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/configuration/admin/display/ClickToChatSiteSettingsConfigurationScreenWrapper.java
index 1d794372948145..c93f0d6fcdf66a 100644
--- a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/configuration/admin/display/ClickToChatSiteSettingsConfigurationScreenWrapper.java
+++ b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/configuration/admin/display/ClickToChatSiteSettingsConfigurationScreenWrapper.java
@@ -17,13 +17,13 @@
import com.liferay.site.settings.configuration.admin.display.SiteSettingsConfigurationScreenContributor;
import com.liferay.site.settings.configuration.admin.display.SiteSettingsConfigurationScreenFactory;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/events/LogoutPreAction.java b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/events/LogoutPreAction.java
index a51de68d00f24d..4dfe3e3977f9f3 100644
--- a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/events/LogoutPreAction.java
+++ b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/events/LogoutPreAction.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/portlet/action/SaveCompanyConfigurationMVCActionCommand.java b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/portlet/action/SaveCompanyConfigurationMVCActionCommand.java
index 3dba2b9c1f8e77..c2c915018c71b0 100644
--- a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/portlet/action/SaveCompanyConfigurationMVCActionCommand.java
+++ b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/portlet/action/SaveCompanyConfigurationMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.INSTANCE_SETTINGS,
"mvc.command.name=/click_to_chat/save_company_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/portlet/action/SaveSiteConfigurationMVCActionCommand.java b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/portlet/action/SaveSiteConfigurationMVCActionCommand.java
index 6052da246df296..b68fc48fa63d19 100644
--- a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/portlet/action/SaveSiteConfigurationMVCActionCommand.java
+++ b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/portlet/action/SaveSiteConfigurationMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ConfigurationAdminPortletKeys.SITE_SETTINGS,
+ "jakarta.portlet.name=" + ConfigurationAdminPortletKeys.SITE_SETTINGS,
"mvc.command.name=/click_to_chat/save_site_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/servlet/taglib/ClickToChatBottomJSPDynamicInclude.java b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/servlet/taglib/ClickToChatBottomJSPDynamicInclude.java
index d8c08e9c510f21..0bf00272d5d851 100644
--- a/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/servlet/taglib/ClickToChatBottomJSPDynamicInclude.java
+++ b/modules/apps/click-to-chat/click-to-chat-web/src/main/java/com/liferay/click/to/chat/web/internal/servlet/taglib/ClickToChatBottomJSPDynamicInclude.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/click-to-chat/click-to-chat-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/click-to-chat/click-to-chat-web/src/main/resources/META-INF/resources/init.jsp
index 73951673e450b9..7ad193d2a667ba 100644
--- a/modules/apps/click-to-chat/click-to-chat-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/click-to-chat/click-to-chat-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/client-extension/client-extension-api/build.gradle b/modules/apps/client-extension/client-extension-api/build.gradle
index 2f514c7311d0bd..a5c1c025464396 100644
--- a/modules/apps/client-extension/client-extension-api/build.gradle
+++ b/modules/apps/client-extension/client-extension-api/build.gradle
@@ -1,6 +1,6 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/client-extension/client-extension-service/build.gradle b/modules/apps/client-extension/client-extension-service/build.gradle
index 0ea201a9a68eb7..ef3302e0856fe6 100644
--- a/modules/apps/client-extension/client-extension-service/build.gradle
+++ b/modules/apps/client-extension/client-extension-service/build.gradle
@@ -4,10 +4,10 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/events/ClientExtensionsServicePreAction.java b/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/events/ClientExtensionsServicePreAction.java
index eb4a40c38e0bff..949e93fa9361ee 100644
--- a/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/events/ClientExtensionsServicePreAction.java
+++ b/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/events/ClientExtensionsServicePreAction.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/search/ClientExtensionEntryIndexer.java b/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/search/ClientExtensionEntryIndexer.java
index b789f9d91c1f0b..a340adc2724cf6 100644
--- a/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/search/ClientExtensionEntryIndexer.java
+++ b/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/search/ClientExtensionEntryIndexer.java
@@ -23,10 +23,10 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Localization;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/service/taglib/BaseDynamicInclude.java b/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/service/taglib/BaseDynamicInclude.java
index 0185ac9ceac173..ee58b5d84fde18 100644
--- a/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/service/taglib/BaseDynamicInclude.java
+++ b/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/service/taglib/BaseDynamicInclude.java
@@ -30,6 +30,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
@@ -37,9 +40,6 @@
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Reference;
/**
diff --git a/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/service/taglib/ClientExtensionTopHeadDynamicInclude.java b/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/service/taglib/ClientExtensionTopHeadDynamicInclude.java
index c6768e2632fc37..f7c06ba8450f66 100644
--- a/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/service/taglib/ClientExtensionTopHeadDynamicInclude.java
+++ b/modules/apps/client-extension/client-extension-service/src/main/java/com/liferay/client/extension/internal/service/taglib/ClientExtensionTopHeadDynamicInclude.java
@@ -22,14 +22,14 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-test/src/testIntegration/java/com/liferay/client/extension/type/internal/configuration/test/CETConfigurationFactoryTest.java b/modules/apps/client-extension/client-extension-test/src/testIntegration/java/com/liferay/client/extension/type/internal/configuration/test/CETConfigurationFactoryTest.java
index 82414b6325bafd..8e1da506227973 100644
--- a/modules/apps/client-extension/client-extension-test/src/testIntegration/java/com/liferay/client/extension/type/internal/configuration/test/CETConfigurationFactoryTest.java
+++ b/modules/apps/client-extension/client-extension-test/src/testIntegration/java/com/liferay/client/extension/type/internal/configuration/test/CETConfigurationFactoryTest.java
@@ -44,6 +44,8 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+import jakarta.portlet.Portlet;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Dictionary;
@@ -51,8 +53,6 @@
import java.util.ListIterator;
import java.util.concurrent.TimeoutException;
-import javax.portlet.Portlet;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
@@ -345,10 +345,10 @@ private void _testAddCET() throws Exception {
Assert.assertEquals("Test " + _VIRTUAL_HOSTNAME, cet.getName());
String filterString = StringBundler.concat(
- "(&(javax.portlet.name=com_liferay_client_extension_web",
+ "(&(jakarta.portlet.name=com_liferay_client_extension_web",
"_internal_portlet_ClientExtensionEntryPortlet_",
_virtualInstanceCompanyId, "_LXC_test)",
- "(objectClass=javax.portlet.Portlet))");
+ "(objectClass=jakarta.portlet.Portlet))");
int timeout = 10_000;
ServiceTracker serviceTracker =
diff --git a/modules/apps/client-extension/client-extension-test/src/testIntegration/java/com/liferay/client/extension/upgrade/v3_0_1/test/UpgradePortletIdTest.java b/modules/apps/client-extension/client-extension-test/src/testIntegration/java/com/liferay/client/extension/upgrade/v3_0_1/test/UpgradePortletIdTest.java
index cfa8d92513e636..31838d244e871d 100644
--- a/modules/apps/client-extension/client-extension-test/src/testIntegration/java/com/liferay/client/extension/upgrade/v3_0_1/test/UpgradePortletIdTest.java
+++ b/modules/apps/client-extension/client-extension-test/src/testIntegration/java/com/liferay/client/extension/upgrade/v3_0_1/test/UpgradePortletIdTest.java
@@ -32,12 +32,12 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
+import jakarta.portlet.Portlet;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Objects;
-import javax.portlet.Portlet;
-
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -181,7 +181,7 @@ Portlet.class, new MVCPortlet(),
).put(
"com.liferay.portlet.preferences-unique-per-layout", true
).put(
- "javax.portlet.name", oldPortletId
+ "jakarta.portlet.name", oldPortletId
).build());
}
diff --git a/modules/apps/client-extension/client-extension-type-api/build.gradle b/modules/apps/client-extension/client-extension-type-api/build.gradle
index fe2b657d16c34e..1c11e54ccc2cf2 100644
--- a/modules/apps/client-extension/client-extension-type-api/build.gradle
+++ b/modules/apps/client-extension/client-extension-type-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:client-extension:client-extension-api")
diff --git a/modules/apps/client-extension/client-extension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETFactory.java b/modules/apps/client-extension/client-extension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETFactory.java
index 2543a7d06209a0..09b27e880c2abc 100644
--- a/modules/apps/client-extension/client-extension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETFactory.java
+++ b/modules/apps/client-extension/client-extension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETFactory.java
@@ -13,11 +13,11 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.portlet.PortletRequest;
+
import java.util.Collection;
import java.util.Map;
-import javax.portlet.PortletRequest;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/client-extension/client-extension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETImplFactory.java b/modules/apps/client-extension/client-extension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETImplFactory.java
index 0b460119577dfb..a238d87479661f 100644
--- a/modules/apps/client-extension/client-extension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETImplFactory.java
+++ b/modules/apps/client-extension/client-extension-type-api/src/main/java/com/liferay/client/extension/type/factory/CETImplFactory.java
@@ -9,11 +9,11 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/client-extension/client-extension-type-impl/build.gradle b/modules/apps/client-extension/client-extension-type-impl/build.gradle
index 6496ff0d2c28e4..d29b7737048dd4 100644
--- a/modules/apps/client-extension/client-extension-type-impl/build.gradle
+++ b/modules/apps/client-extension/client-extension-type-impl/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CETFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CETFactoryImpl.java
index b375d6b04c4afa..d77372e346613a 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CETFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CETFactoryImpl.java
@@ -30,6 +30,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.util.ArrayList;
@@ -43,8 +45,6 @@
import java.util.TreeSet;
import java.util.regex.Pattern;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CommerceCheckoutStepCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CommerceCheckoutStepCETImplFactoryImpl.java
index aea43a0e448572..18e4938b2a8891 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CommerceCheckoutStepCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CommerceCheckoutStepCETImplFactoryImpl.java
@@ -12,11 +12,11 @@
import com.liferay.portal.kernel.util.UnicodeProperties;
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Andrea Sbarra
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CustomElementCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CustomElementCETImplFactoryImpl.java
index 65e71d5110aa8b..9db71ca24fb5d4 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CustomElementCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/CustomElementCETImplFactoryImpl.java
@@ -18,14 +18,14 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/EditorConfigContributorCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/EditorConfigContributorCETImplFactoryImpl.java
index 5a87c0a9a3756c..72c4c7e053ff46 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/EditorConfigContributorCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/EditorConfigContributorCETImplFactoryImpl.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Daniel Sanz
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/FDSCellRendererCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/FDSCellRendererCETImplFactoryImpl.java
index f605fa9fa12b57..0952889e5b9a45 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/FDSCellRendererCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/FDSCellRendererCETImplFactoryImpl.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/FDSFilterCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/FDSFilterCETImplFactoryImpl.java
index 57ffdca6fc4374..c61481e6040a04 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/FDSFilterCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/FDSFilterCETImplFactoryImpl.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Bryce Osterhaus
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/GlobalCSSCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/GlobalCSSCETImplFactoryImpl.java
index 4b451f5396a1b7..1a5f31a51183bf 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/GlobalCSSCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/GlobalCSSCETImplFactoryImpl.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/GlobalJSCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/GlobalJSCETImplFactoryImpl.java
index 16d400f8dba81c..c45b661c4f9a7a 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/GlobalJSCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/GlobalJSCETImplFactoryImpl.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
import java.util.Set;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/IFrameCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/IFrameCETImplFactoryImpl.java
index 9d13d638378b14..fddf707d794218 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/IFrameCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/IFrameCETImplFactoryImpl.java
@@ -14,13 +14,13 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/JSImportMapsEntryCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/JSImportMapsEntryCETImplFactoryImpl.java
index d14d9167700dfd..5352f2e7cd859f 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/JSImportMapsEntryCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/JSImportMapsEntryCETImplFactoryImpl.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/StaticContentCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/StaticContentCETImplFactoryImpl.java
index 69bf8824364935..d341d0c8cd2704 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/StaticContentCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/StaticContentCETImplFactoryImpl.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Gregory Amerson
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeCSSCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeCSSCETImplFactoryImpl.java
index e8daeecf67f2c9..ea701fcc844dea 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeCSSCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeCSSCETImplFactoryImpl.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeFaviconCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeFaviconCETImplFactoryImpl.java
index 7451c6a981e1f6..bbbf90fc06a915 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeFaviconCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeFaviconCETImplFactoryImpl.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeSpritemapCETImplFactoryImpl.java b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeSpritemapCETImplFactoryImpl.java
index c50455967f8a73..aac73e2109ce49 100644
--- a/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeSpritemapCETImplFactoryImpl.java
+++ b/modules/apps/client-extension/client-extension-type-impl/src/main/java/com/liferay/client/extension/type/internal/factory/ThemeSpritemapCETImplFactoryImpl.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+
import java.util.Date;
import java.util.Properties;
-import javax.portlet.PortletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-type-item-selector-web/build.gradle b/modules/apps/client-extension/client-extension-type-item-selector-web/build.gradle
index 5df4957521a430..0af355826e5d8e 100644
--- a/modules/apps/client-extension/client-extension-type-item-selector-web/build.gradle
+++ b/modules/apps/client-extension/client-extension-type-item-selector-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:client-extension:client-extension-api")
diff --git a/modules/apps/client-extension/client-extension-type-item-selector-web/src/main/java/com/liferay/client/extension/type/item/selector/web/internal/item/selector/CETItemSelectorView.java b/modules/apps/client-extension/client-extension-type-item-selector-web/src/main/java/com/liferay/client/extension/type/item/selector/web/internal/item/selector/CETItemSelectorView.java
index d81280ae6fb76c..325a9fc2ff9cdf 100644
--- a/modules/apps/client-extension/client-extension-type-item-selector-web/src/main/java/com/liferay/client/extension/type/item/selector/web/internal/item/selector/CETItemSelectorView.java
+++ b/modules/apps/client-extension/client-extension-type-item-selector-web/src/main/java/com/liferay/client/extension/type/item/selector/web/internal/item/selector/CETItemSelectorView.java
@@ -13,19 +13,19 @@
import com.liferay.item.selector.ItemSelectorViewDescriptorRenderer;
import com.liferay.portal.kernel.language.Language;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-type-item-selector-web/src/main/java/com/liferay/client/extension/type/item/selector/web/internal/item/selector/CETItemSelectorViewDescriptor.java b/modules/apps/client-extension/client-extension-type-item-selector-web/src/main/java/com/liferay/client/extension/type/item/selector/web/internal/item/selector/CETItemSelectorViewDescriptor.java
index 6e19467b4ae1a9..39e5cf12e9aa88 100644
--- a/modules/apps/client-extension/client-extension-type-item-selector-web/src/main/java/com/liferay/client/extension/type/item/selector/web/internal/item/selector/CETItemSelectorViewDescriptor.java
+++ b/modules/apps/client-extension/client-extension-type-item-selector-web/src/main/java/com/liferay/client/extension/type/item/selector/web/internal/item/selector/CETItemSelectorViewDescriptor.java
@@ -25,15 +25,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
import java.util.function.Predicate;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Víctor Galán
*/
diff --git a/modules/apps/client-extension/client-extension-web/build.gradle b/modules/apps/client-extension/client-extension-web/build.gradle
index a9bb4a2e62d737..30fe7740ac17cb 100644
--- a/modules/apps/client-extension/client-extension-web/build.gradle
+++ b/modules/apps/client-extension/client-extension-web/build.gradle
@@ -1,12 +1,12 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.java", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/application/list/ClientExtensionAdminPanelApp.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/application/list/ClientExtensionAdminPanelApp.java
index 47f2116dae9e85..dcbd163769b81e 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/application/list/ClientExtensionAdminPanelApp.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/application/list/ClientExtensionAdminPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN + ")"
+ target = "(jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/change/tracking/spi/display/ClientExtensionEntryCTDisplayRenderer.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/change/tracking/spi/display/ClientExtensionEntryCTDisplayRenderer.java
index dce52628279d89..4224a660d7015e 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/change/tracking/spi/display/ClientExtensionEntryCTDisplayRenderer.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/change/tracking/spi/display/ClientExtensionEntryCTDisplayRenderer.java
@@ -15,11 +15,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/ClientExtensionAdminDisplayContext.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/ClientExtensionAdminDisplayContext.java
index 64cf5fc74df8f1..41e43315f59f80 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/ClientExtensionAdminDisplayContext.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/ClientExtensionAdminDisplayContext.java
@@ -16,10 +16,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Iván Zaera Avellón
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/EditClientExtensionEntryDisplayContext.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/EditClientExtensionEntryDisplayContext.java
index 4d9626a3e11bf8..0c2f1d71828ea9 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/EditClientExtensionEntryDisplayContext.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/EditClientExtensionEntryDisplayContext.java
@@ -26,6 +26,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.util.WebAppPool;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -33,10 +37,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/ViewClientExtensionEntryDisplayContext.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/ViewClientExtensionEntryDisplayContext.java
index 337b514f575433..d4c162afcf93d8 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/ViewClientExtensionEntryDisplayContext.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/display/context/ViewClientExtensionEntryDisplayContext.java
@@ -17,6 +17,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -25,10 +29,6 @@
import java.util.Comparator;
import java.util.List;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/frontend/data/set/provider/CETFDSActionProvider.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/frontend/data/set/provider/CETFDSActionProvider.java
index 4a448ec6719edc..48fbf2e1c21ef7 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/frontend/data/set/provider/CETFDSActionProvider.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/frontend/data/set/provider/CETFDSActionProvider.java
@@ -25,13 +25,13 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.ResourceURL;
-import javax.portlet.PortletURL;
-import javax.portlet.ResourceURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.ResourceBundle;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/frontend/data/set/provider/CETFDSDataProvider.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/frontend/data/set/provider/CETFDSDataProvider.java
index 4da86f143bf11a..bd5c43f9c55bb9 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/frontend/data/set/provider/CETFDSDataProvider.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/frontend/data/set/provider/CETFDSDataProvider.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.vulcan.pagination.Pagination;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/BaseCETPortlet.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/BaseCETPortlet.java
index 54b8efdca1b1e3..c2cf48c99dfd4e 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/BaseCETPortlet.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/BaseCETPortlet.java
@@ -13,13 +13,13 @@
import com.liferay.portal.kernel.util.PropertiesUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+
import java.io.IOException;
import java.util.Properties;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-
/**
* @author Iván Zaera Avellón
*/
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/CETPortletFriendlyURLMapper.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/CETPortletFriendlyURLMapper.java
index f230a6ba00bb25..5e99beca6763f9 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/CETPortletFriendlyURLMapper.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/CETPortletFriendlyURLMapper.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.util.HashMapDictionaryBuilder;
import com.liferay.portlet.RouterImpl;
+import jakarta.portlet.WindowState;
+
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
-import javax.portlet.WindowState;
-
/**
* @author Iván Zaera Avellón
*/
@@ -63,7 +63,7 @@ public String buildPath(LiferayPortletURL liferayPortletURL) {
@Override
public Dictionary getDictionary() {
return HashMapDictionaryBuilder.put(
- "javax.portlet.name", _portletId
+ "jakarta.portlet.name", _portletId
).build();
}
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/ClientExtensionAdminPortlet.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/ClientExtensionAdminPortlet.java
index 783fb99be647bc..2414955e32824a 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/ClientExtensionAdminPortlet.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/ClientExtensionAdminPortlet.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.model.Release;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,15 +28,15 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Remote Apps",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.mvc-command-names-default-views=/admin/view",
- "javax.portlet.init-param.portlet-title-based-navigation=true",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=administrator",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Remote Apps",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.mvc-command-names-default-views=/admin/view",
+ "jakarta.portlet.init-param.portlet-title-based-navigation=true",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=administrator",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/CustomElementCETPortlet.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/CustomElementCETPortlet.java
index 8e070430040bff..1a0e05d8b90775 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/CustomElementCETPortlet.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/CustomElementCETPortlet.java
@@ -24,6 +24,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
@@ -31,9 +34,6 @@
import java.util.Map;
import java.util.Properties;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author Iván Zaera Avellón
*/
@@ -64,13 +64,13 @@ public Dictionary getDictionary() {
).put(
"com.liferay.portlet.instanceable", cet.isInstanceable()
).put(
- "javax.portlet.display-name", cet.getName(LocaleUtil.US)
+ "jakarta.portlet.display-name", cet.getName(LocaleUtil.US)
).put(
- "javax.portlet.name", _portletId
+ "jakarta.portlet.name", _portletId
).put(
- "javax.portlet.security-role-ref", "power-user,user"
+ "jakarta.portlet.security-role-ref", "power-user,user"
).put(
- "javax.portlet.version", "3.0"
+ "jakarta.portlet.version", "3.0"
).build();
long lastModified = System.currentTimeMillis();
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/IFrameCETPortlet.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/IFrameCETPortlet.java
index 556af6a38afbe5..53ded7a87c8ed4 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/IFrameCETPortlet.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/IFrameCETPortlet.java
@@ -16,6 +16,9 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -24,9 +27,6 @@
import java.util.Map;
import java.util.Properties;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author Iván Zaera Avellón
*/
@@ -54,13 +54,13 @@ public Dictionary getDictionary() {
).put(
"com.liferay.portlet.instanceable", cet.isInstanceable()
).put(
- "javax.portlet.display-name", cet.getName(LocaleUtil.US)
+ "jakarta.portlet.display-name", cet.getName(LocaleUtil.US)
).put(
- "javax.portlet.name", _portletId
+ "jakarta.portlet.name", _portletId
).put(
- "javax.portlet.security-role-ref", "power-user,user"
+ "jakarta.portlet.security-role-ref", "power-user,user"
).put(
- "javax.portlet.version", "3.0"
+ "jakarta.portlet.version", "3.0"
).build();
}
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/CETPortletConfigurationAction.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/CETPortletConfigurationAction.java
index a34b42ed2dfc8a..ddf25494578a23 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/CETPortletConfigurationAction.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/CETPortletConfigurationAction.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.portlet.DefaultConfigurationAction;
import com.liferay.portal.kernel.util.HashMapDictionaryBuilder;
-import java.util.Dictionary;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Dictionary;
/**
* @author Iván Zaera Avellón
@@ -27,7 +27,7 @@ public CETPortletConfigurationAction(String jspPath, String portletId) {
@Override
public Dictionary getDictionary() {
return HashMapDictionaryBuilder.put(
- "javax.portlet.name", _portletId
+ "jakarta.portlet.name", _portletId
).build();
}
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/DeleteClientExtensionEntryMVCActionCommand.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/DeleteClientExtensionEntryMVCActionCommand.java
index b96b1d673c89a5..56b1d72926f4c3 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/DeleteClientExtensionEntryMVCActionCommand.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/DeleteClientExtensionEntryMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
"mvc.command.name=/client_extension_admin/delete_client_extension_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/EditClientExtensionEntryMVCActionCommand.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/EditClientExtensionEntryMVCActionCommand.java
index 64565e1c212546..0f03e9101cf6b4 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/EditClientExtensionEntryMVCActionCommand.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/EditClientExtensionEntryMVCActionCommand.java
@@ -25,8 +25,8 @@
import com.liferay.portal.kernel.util.PropertiesUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
"mvc.command.name=/client_extension_admin/edit_client_extension_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/EditClientExtensionEntryMVCRenderCommand.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/EditClientExtensionEntryMVCRenderCommand.java
index 8699cec13b6dad..cc31f6af8d19d9 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/EditClientExtensionEntryMVCRenderCommand.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/EditClientExtensionEntryMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
"mvc.command.name=/client_extension_admin/edit_client_extension_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ExportClientExtensionEntryMVCResourceCommand.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ExportClientExtensionEntryMVCResourceCommand.java
index acc59f38caafbb..01acafb1aafcba 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ExportClientExtensionEntryMVCResourceCommand.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ExportClientExtensionEntryMVCResourceCommand.java
@@ -23,17 +23,17 @@
import com.liferay.portal.kernel.util.DateUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.text.DateFormat;
import java.util.Date;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,7 +42,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
"mvc.command.name=/client_extension_admin/export_client_extension_entry"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ImportClientExtensionEntryMVCResourceCommand.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ImportClientExtensionEntryMVCResourceCommand.java
index f6de276c58cbd7..acb5e57b32a660 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ImportClientExtensionEntryMVCResourceCommand.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ImportClientExtensionEntryMVCResourceCommand.java
@@ -28,19 +28,19 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Part;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Objects;
-import javax.portlet.PortletException;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,7 +49,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
"mvc.command.name=/client_extension_admin/import_client_extension_entry"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ViewClientExtensionEntryMVCRenderCommand.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ViewClientExtensionEntryMVCRenderCommand.java
index 7d619bb8204f8f..842f70c529b87f 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ViewClientExtensionEntryMVCRenderCommand.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ViewClientExtensionEntryMVCRenderCommand.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
"mvc.command.name=/client_extension_admin/view_client_extension_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ViewMVCRenderCommand.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ViewMVCRenderCommand.java
index a14072f3222e2f..920d4d82245d34 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ViewMVCRenderCommand.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/action/ViewMVCRenderCommand.java
@@ -11,9 +11,9 @@
import com.liferay.client.extension.web.internal.display.context.ClientExtensionAdminDisplayContext;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
"mvc.command.name=/"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/configuration/icon/ImportClientExtensionEntryPortletConfigurationIcon.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/configuration/icon/ImportClientExtensionEntryPortletConfigurationIcon.java
index cd075a2cc5272a..92eba35563b2e8 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/configuration/icon/ImportClientExtensionEntryPortletConfigurationIcon.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/configuration/icon/ImportClientExtensionEntryPortletConfigurationIcon.java
@@ -11,11 +11,11 @@
import com.liferay.portal.kernel.portlet.configuration.icon.PortletConfigurationIcon;
import com.liferay.portal.kernel.util.HashMapBuilder;
-import java.util.Map;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
* @author Iván Zaera Avellón
*/
@Component(
- property = "javax.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
+ property = "jakarta.portlet.name=" + ClientExtensionAdminPortletKeys.CLIENT_EXTENSION_ADMIN,
service = PortletConfigurationIcon.class
)
public class ImportClientExtensionEntryPortletConfigurationIcon
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/editor/config/contributor/CETEditorConfigContributor.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/editor/config/contributor/CETEditorConfigContributor.java
index 114f8b2008402a..7d06155c1996d6 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/editor/config/contributor/CETEditorConfigContributor.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/portlet/editor/config/contributor/CETEditorConfigContributor.java
@@ -56,7 +56,7 @@ public Dictionary getDictionary() {
return null;
}
).put(
- "javax.portlet.name",
+ "jakarta.portlet.name",
() -> {
if (Validator.isNotNull(_portletNames)) {
return _portletNames.split(StringPool.NEW_LINE);
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/product/navigation/control/menu/BetaClientExtensionProductNavigationControlMenuEntry.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/product/navigation/control/menu/BetaClientExtensionProductNavigationControlMenuEntry.java
index 4f3631c4846a36..d584a1894d87f5 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/product/navigation/control/menu/BetaClientExtensionProductNavigationControlMenuEntry.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/product/navigation/control/menu/BetaClientExtensionProductNavigationControlMenuEntry.java
@@ -15,10 +15,10 @@
import com.liferay.product.navigation.control.menu.ProductNavigationControlMenuEntry;
import com.liferay.product.navigation.control.menu.constants.ProductNavigationControlMenuCategoryKeys;
-import java.util.Objects;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/type/deployer/CETDeployerImpl.java b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/type/deployer/CETDeployerImpl.java
index 05b4edd126e5d7..cd852205ef7bf1 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/type/deployer/CETDeployerImpl.java
+++ b/modules/apps/client-extension/client-extension-web/src/main/java/com/liferay/client/extension/web/internal/type/deployer/CETDeployerImpl.java
@@ -38,14 +38,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.Portlet;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import javax.portlet.Portlet;
-
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/client-extension/client-extension-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/client-extension/client-extension-web/src/main/resources/META-INF/resources/init.jsp
index 170f94bb4721f2..c603146203fb1d 100644
--- a/modules/apps/client-extension/client-extension-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/client-extension/client-extension-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/client-extension/client-extension-web/src/test/java/com/liferay/client/extension/web/internal/portlet/IFrameCETPortletTest.java b/modules/apps/client-extension/client-extension-web/src/test/java/com/liferay/client/extension/web/internal/portlet/IFrameCETPortletTest.java
index 2a07b21ed9b93c..00bcdc3b5aca74 100644
--- a/modules/apps/client-extension/client-extension-web/src/test/java/com/liferay/client/extension/web/internal/portlet/IFrameCETPortletTest.java
+++ b/modules/apps/client-extension/client-extension-web/src/test/java/com/liferay/client/extension/web/internal/portlet/IFrameCETPortletTest.java
@@ -12,15 +12,15 @@
import com.liferay.portal.util.PortalImpl;
import com.liferay.portletmvc4spring.test.mock.web.portlet.MockPortletPreferences;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.io.CharArrayWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Properties;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/comment/comment-analytics/build.gradle b/modules/apps/comment/comment-analytics/build.gradle
index cbb178cadc5118..585cd584134a73 100644
--- a/modules/apps/comment/comment-analytics/build.gradle
+++ b/modules/apps/comment/comment-analytics/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":core:petra:petra-sql-dsl-api")
compileOnly project(":core:petra:petra-string")
diff --git a/modules/apps/comment/comment-analytics/src/main/java/com/liferay/comment/analytics/internal/servlet/taglib/CommentAnalyticsTopHeadJSPDynamicInclude.java b/modules/apps/comment/comment-analytics/src/main/java/com/liferay/comment/analytics/internal/servlet/taglib/CommentAnalyticsTopHeadJSPDynamicInclude.java
index 5d8088b3119d46..1088f7e7a5c72c 100644
--- a/modules/apps/comment/comment-analytics/src/main/java/com/liferay/comment/analytics/internal/servlet/taglib/CommentAnalyticsTopHeadJSPDynamicInclude.java
+++ b/modules/apps/comment/comment-analytics/src/main/java/com/liferay/comment/analytics/internal/servlet/taglib/CommentAnalyticsTopHeadJSPDynamicInclude.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.servlet.taglib.BaseJSPDynamicInclude;
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/comment/comment-page-comments-web/build.gradle b/modules/apps/comment/comment-page-comments-web/build.gradle
index 3407d77ba4fd7b..bd83a6a4bd6f9f 100644
--- a/modules/apps/comment/comment-page-comments-web/build.gradle
+++ b/modules/apps/comment/comment-page-comments-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-api")
diff --git a/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/exportimport/data/handler/PageCommentsPortletDataHandler.java b/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/exportimport/data/handler/PageCommentsPortletDataHandler.java
index 4ff6f8a2580206..edebd5191548ce 100644
--- a/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/exportimport/data/handler/PageCommentsPortletDataHandler.java
+++ b/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/exportimport/data/handler/PageCommentsPortletDataHandler.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.model.StagedModel;
import com.liferay.portal.kernel.xml.Element;
+import jakarta.portlet.PortletPreferences;
+
import java.util.List;
import java.util.concurrent.Callable;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
* @author Gergely Mathe
*/
@Component(
- property = "javax.portlet.name=" + PageCommentsPortletKeys.PAGE_COMMENTS,
+ property = "jakarta.portlet.name=" + PageCommentsPortletKeys.PAGE_COMMENTS,
service = PortletDataHandler.class
)
public class PageCommentsPortletDataHandler extends BasePortletDataHandler {
diff --git a/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/layout/asset/entry/provider/PageCommentsLayoutAssetEntryProvider.java b/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/layout/asset/entry/provider/PageCommentsLayoutAssetEntryProvider.java
index 15c829a613ee31..d4baf4c5888d74 100644
--- a/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/layout/asset/entry/provider/PageCommentsLayoutAssetEntryProvider.java
+++ b/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/layout/asset/entry/provider/PageCommentsLayoutAssetEntryProvider.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Roberto Díaz
*/
@Component(
- property = "javax.portlet.name=" + PageCommentsPortletKeys.PAGE_COMMENTS,
+ property = "jakarta.portlet.name=" + PageCommentsPortletKeys.PAGE_COMMENTS,
service = LayoutAssetEntryProvider.class
)
public class PageCommentsLayoutAssetEntryProvider
diff --git a/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/portlet/PageCommentsPortlet.java b/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/portlet/PageCommentsPortlet.java
index 763324d7768d5b..6df2214021fb5f 100644
--- a/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/portlet/PageCommentsPortlet.java
+++ b/modules/apps/comment/comment-page-comments-web/src/main/java/com/liferay/comment/page/comments/web/internal/portlet/PageCommentsPortlet.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.model.Release;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,15 +27,15 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Page Comments",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.add-process-action-success-action=false",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + PageCommentsPortletKeys.PAGE_COMMENTS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Page Comments",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.add-process-action-success-action=false",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + PageCommentsPortletKeys.PAGE_COMMENTS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/comment/comment-page-comments-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/comment/comment-page-comments-web/src/main/resources/META-INF/resources/init.jsp
index 27b14ec12d2b83..dfb9d21e3ce7eb 100644
--- a/modules/apps/comment/comment-page-comments-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/comment/comment-page-comments-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/comment" prefix="liferay-comment" %><%@
taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
diff --git a/modules/apps/comment/comment-sanitizer/build.gradle b/modules/apps/comment/comment-sanitizer/build.gradle
index 1178102faa4bdd..659266137c371e 100644
--- a/modules/apps/comment/comment-sanitizer/build.gradle
+++ b/modules/apps/comment/comment-sanitizer/build.gradle
@@ -3,7 +3,7 @@ dependencies {
compileOnly group: "com.google.guava", name: "guava", version: "32.0.1-jre"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":core:petra:petra-string")
}
\ No newline at end of file
diff --git a/modules/apps/comment/comment-taglib/build.gradle b/modules/apps/comment/comment-taglib/build.gradle
index 752b1e819b9b94..b46fb8d240d0da 100644
--- a/modules/apps/comment/comment-taglib/build.gradle
+++ b/modules/apps/comment/comment-taglib/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:comment:comment-api")
compileOnly project(":apps:frontend-editor:frontend-editor-taglib")
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProvider.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProvider.java
index d611f221f3ded4..e9abab8ad25d92 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProvider.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProvider.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.comment.display.context.CommentSectionDisplayContext;
import com.liferay.portal.kernel.comment.display.context.CommentTreeDisplayContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProviderImpl.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProviderImpl.java
index 435e060b10cc6e..4a798e7d3d0de6 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProviderImpl.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProviderImpl.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.comment.display.context.CommentTreeDisplayContext;
import com.liferay.portal.kernel.display.context.BaseDisplayContextProvider;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProviderUtil.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProviderUtil.java
index bce75200162106..c721527ac1a0db 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProviderUtil.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/CommentDisplayContextProviderUtil.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.comment.display.context.CommentSectionDisplayContext;
import com.liferay.portal.kernel.comment.display.context.CommentTreeDisplayContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/helper/DiscussionRequestHelper.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/helper/DiscussionRequestHelper.java
index c4b78f2e25b898..a982ffbfde194e 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/helper/DiscussionRequestHelper.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/helper/DiscussionRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/helper/DiscussionTaglibHelper.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/helper/DiscussionTaglibHelper.java
index d81c0271cb9539..649569409e7675 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/helper/DiscussionTaglibHelper.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/context/helper/DiscussionTaglibHelper.java
@@ -8,7 +8,7 @@
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.util.GetterUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Adolfo Pérez
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/EditDiscussionStrutsAction.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/EditDiscussionStrutsAction.java
index e8c8c11dfae08e..acc0a213417f0b 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/EditDiscussionStrutsAction.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/EditDiscussionStrutsAction.java
@@ -38,13 +38,13 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.servlet.NamespaceServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.function.Function;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/GetCommentsStrutsAction.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/GetCommentsStrutsAction.java
index ae929d1d1a14ac..411dbe40b0d45c 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/GetCommentsStrutsAction.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/GetCommentsStrutsAction.java
@@ -11,10 +11,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.servlet.NamespaceServletRequest;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/GetEditorStrutsAction.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/GetEditorStrutsAction.java
index ce38feb786e0eb..34c3153c1f349e 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/GetEditorStrutsAction.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/internal/struts/GetEditorStrutsAction.java
@@ -11,10 +11,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.servlet.NamespaceServletRequest;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/servlet/taglib/DiscussionTag.java b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/servlet/taglib/DiscussionTag.java
index 65bf37be1208d4..1e38ebcf58545a 100644
--- a/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/servlet/taglib/DiscussionTag.java
+++ b/modules/apps/comment/comment-taglib/src/main/java/com/liferay/comment/taglib/servlet/taglib/DiscussionTag.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Charles May
diff --git a/modules/apps/comment/comment-taglib/src/main/resources/META-INF/resources/init.jsp b/modules/apps/comment/comment-taglib/src/main/resources/META-INF/resources/init.jsp
index 3016103e4440fa..b8c3511254eee2 100644
--- a/modules/apps/comment/comment-taglib/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/comment/comment-taglib/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -47,16 +47,16 @@ page import="com.liferay.subscription.service.SubscriptionLocalServiceUtil" %><%
page import="com.liferay.taglib.aui.AUIUtil" %><%@
page import="com.liferay.taglib.util.TagResourceBundleUtil" %>
+<%@ page import="jakarta.portlet.PortletMode" %><%@
+page import="jakarta.portlet.PortletRequest" %><%@
+page import="jakarta.portlet.PortletResponse" %><%@
+page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.text.Format" %>
<%@ page import="java.util.Date" %><%@
page import="java.util.ResourceBundle" %>
-<%@ page import="javax.portlet.PortletMode" %><%@
-page import="javax.portlet.PortletRequest" %><%@
-page import="javax.portlet.PortletResponse" %><%@
-page import="javax.portlet.PortletURL" %>
-
<%
diff --git a/modules/apps/comment/comment-web-test/src/testIntegration/java/com/liferay/comment/web/internal/notifications/test/CommentUserNotificationHandlerTest.java b/modules/apps/comment/comment-web-test/src/testIntegration/java/com/liferay/comment/web/internal/notifications/test/CommentUserNotificationHandlerTest.java
index 52c956c0fdc3d5..4cdfb7263a327a 100644
--- a/modules/apps/comment/comment-web-test/src/testIntegration/java/com/liferay/comment/web/internal/notifications/test/CommentUserNotificationHandlerTest.java
+++ b/modules/apps/comment/comment-web-test/src/testIntegration/java/com/liferay/comment/web/internal/notifications/test/CommentUserNotificationHandlerTest.java
@@ -92,7 +92,7 @@ public void testGetBody() throws Exception {
private CommentManager _commentManager;
@Inject(
- filter = "javax.portlet.name=com_liferay_comment_web_portlet_CommentPortlet"
+ filter = "jakarta.portlet.name=com_liferay_comment_web_portlet_CommentPortlet"
)
private UserNotificationHandler _userNotificationHandler;
diff --git a/modules/apps/comment/comment-web/build.gradle b/modules/apps/comment/comment-web/build.gradle
index ba22a0c8e6e9b5..6700453b6a166a 100644
--- a/modules/apps/comment/comment-web/build.gradle
+++ b/modules/apps/comment/comment-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:asset:asset-api")
diff --git a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/asset/model/CommentAssetRenderer.java b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/asset/model/CommentAssetRenderer.java
index 7187bb31f135a3..5be0037351af49 100644
--- a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/asset/model/CommentAssetRenderer.java
+++ b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/asset/model/CommentAssetRenderer.java
@@ -30,15 +30,15 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Jorge Ferrer
diff --git a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/asset/model/CommentAssetRendererFactory.java b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/asset/model/CommentAssetRendererFactory.java
index 47c75b7e64831e..f12444cc34a717 100644
--- a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/asset/model/CommentAssetRendererFactory.java
+++ b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/asset/model/CommentAssetRendererFactory.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.security.permission.PermissionChecker;
import com.liferay.portal.kernel.util.HtmlParser;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
* @author Jorge Ferrer
*/
@Component(
- property = "javax.portlet.name=" + CommentPortletKeys.COMMENT,
+ property = "jakarta.portlet.name=" + CommentPortletKeys.COMMENT,
service = AssetRendererFactory.class
)
public class CommentAssetRendererFactory
diff --git a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentAddEntryUserNotificationDefinition.java b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentAddEntryUserNotificationDefinition.java
index e1e8505ab5af84..5742ca43123437 100644
--- a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentAddEntryUserNotificationDefinition.java
+++ b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentAddEntryUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Adolfo Pérez
*/
@Component(
- property = "javax.portlet.name=" + CommentPortletKeys.COMMENT,
+ property = "jakarta.portlet.name=" + CommentPortletKeys.COMMENT,
service = UserNotificationDefinition.class
)
public class CommentAddEntryUserNotificationDefinition
diff --git a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentUpdateEntryUserNotificationDefinition.java b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentUpdateEntryUserNotificationDefinition.java
index 609b961a76e4c4..d7617138705779 100644
--- a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentUpdateEntryUserNotificationDefinition.java
+++ b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentUpdateEntryUserNotificationDefinition.java
@@ -16,7 +16,7 @@
* @author Adolfo Pérez
*/
@Component(
- property = "javax.portlet.name=" + CommentPortletKeys.COMMENT,
+ property = "jakarta.portlet.name=" + CommentPortletKeys.COMMENT,
service = UserNotificationDefinition.class
)
public class CommentUpdateEntryUserNotificationDefinition
diff --git a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentUserNotificationHandler.java b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentUserNotificationHandler.java
index 431ef82eb03d43..3e511fe4a1a214 100644
--- a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentUserNotificationHandler.java
+++ b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/notifications/CommentUserNotificationHandler.java
@@ -34,7 +34,7 @@
* @author Sergio González
*/
@Component(
- property = "javax.portlet.name=" + CommentPortletKeys.COMMENT,
+ property = "jakarta.portlet.name=" + CommentPortletKeys.COMMENT,
service = UserNotificationHandler.class
)
public class CommentUserNotificationHandler
diff --git a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/portlet/CommentPortlet.java b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/portlet/CommentPortlet.java
index bc0b5d88db378f..9e7360487a4a75 100644
--- a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/portlet/CommentPortlet.java
+++ b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/portlet/CommentPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.comment.web.internal.constants.CommentPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -20,14 +20,14 @@
"com.liferay.portlet.add-default-resource=true",
"com.liferay.portlet.display-category=category.hidden",
"com.liferay.portlet.icon=/icons/comment.png",
- "javax.portlet.display-name=Comments",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.name=" + CommentPortletKeys.COMMENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest",
- "javax.portlet.security-role-ref=power-user",
- "javax.portlet.security-role-ref=user", "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Comments",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.name=" + CommentPortletKeys.COMMENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest",
+ "jakarta.portlet.security-role-ref=power-user",
+ "jakarta.portlet.security-role-ref=user", "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/portlet/action/EditDiscussionMVCRenderCommand.java b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/portlet/action/EditDiscussionMVCRenderCommand.java
index a9d598fd94d260..14ce72ac1244fc 100644
--- a/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/portlet/action/EditDiscussionMVCRenderCommand.java
+++ b/modules/apps/comment/comment-web/src/main/java/com/liferay/comment/web/internal/portlet/action/EditDiscussionMVCRenderCommand.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommentPortletKeys.COMMENT,
+ "jakarta.portlet.name=" + CommentPortletKeys.COMMENT,
"mvc.command.name=/comment/edit_discussion"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/comment/comment-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/comment/comment-web/src/main/resources/META-INF/resources/init.jsp
index 79461c37dac162..af21bf27a5e218 100644
--- a/modules/apps/comment/comment-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/comment/comment-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/build.gradle b/modules/apps/commerce/commerce-account-item-selector-web/build.gradle
index 5e47658c0af893..7b7c057062cbcd 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/build.gradle
+++ b/modules/apps/commerce/commerce-account-item-selector-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountGroupAccountItemSelectorView.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountGroupAccountItemSelectorView.java
index d3f33f0142d016..a7b2f97097304f 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountGroupAccountItemSelectorView.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountGroupAccountItemSelectorView.java
@@ -19,21 +19,21 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountGroupItemSelectorView.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountGroupItemSelectorView.java
index d409462b203145..cad2ff9144c026 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountGroupItemSelectorView.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountGroupItemSelectorView.java
@@ -15,21 +15,21 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountItemSelectorView.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountItemSelectorView.java
index 8ce6419dffed84..730b0d92ae896e 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountItemSelectorView.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/CommerceAccountItemSelectorView.java
@@ -17,21 +17,21 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupAccountItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupAccountItemSelectorViewDisplayContext.java
index c47d7606a8354a..a6b34051ef8565 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupAccountItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupAccountItemSelectorViewDisplayContext.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupAccountItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupAccountItemSelectorViewManagementToolbarDisplayContext.java
index 745c67d9e0cb6a..ecbe1898d2ef89 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupAccountItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupAccountItemSelectorViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupItemSelectorViewDisplayContext.java
index c766fcf3d1ec4e..6e0187eb048c85 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupItemSelectorViewDisplayContext.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import java.util.LinkedHashMap;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.LinkedHashMap;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupItemSelectorViewManagementToolbarDisplayContext.java
index 42ffd4363a1513..1eae886f5d8ed0 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountGroupItemSelectorViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountItemSelectorViewDisplayContext.java
index 8be4853f19be09..2ea6fc776ceeb4 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountItemSelectorViewDisplayContext.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountItemSelectorViewManagementToolbarDisplayContext.java
index 581d2e3d255773..8ec15888009b7f 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/CommerceAccountItemSelectorViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/helper/CommerceAccountItemSelectorRequestHelper.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/helper/CommerceAccountItemSelectorRequestHelper.java
index 88ee7c8d0729f3..5746e96255c8ad 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/helper/CommerceAccountItemSelectorRequestHelper.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/display/context/helper/CommerceAccountItemSelectorRequestHelper.java
@@ -8,10 +8,10 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.JavaConstants;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountGroupAccountItemSelectorChecker.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountGroupAccountItemSelectorChecker.java
index 37f2931747e7bc..33cfadab81ba63 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountGroupAccountItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountGroupAccountItemSelectorChecker.java
@@ -11,7 +11,7 @@
import com.liferay.account.service.AccountGroupRelLocalService;
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderResponse;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountGroupItemSelectorChecker.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountGroupItemSelectorChecker.java
index 5f943d70fb5813..2b32151855312f 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountGroupItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountGroupItemSelectorChecker.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.SetUtil;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountItemSelectorChecker.java b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountItemSelectorChecker.java
index b33f497e0ea82a..c564816f09ffa4 100644
--- a/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-account-item-selector-web/src/main/java/com/liferay/commerce/account/item/selector/web/internal/search/CommerceAccountItemSelectorChecker.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.SetUtil;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-account-web/build.gradle b/modules/apps/commerce/commerce-account-web/build.gradle
index 0b16a3231848d1..9ef036fd69cb4c 100644
--- a/modules/apps/commerce/commerce-account-web/build.gradle
+++ b/modules/apps/commerce/commerce-account-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/AccountAddressQualifiersDisplayContext.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/AccountAddressQualifiersDisplayContext.java
index 11f8d46ee149ad..2f9957c4ac9d31 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/AccountAddressQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/AccountAddressQualifiersDisplayContext.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.service.AddressLocalService;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Danny Situ
*/
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/CommerceAccountDisplayContext.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/CommerceAccountDisplayContext.java
index a1b6c6c6df6f6c..62d0a700f6d69b 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/CommerceAccountDisplayContext.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/CommerceAccountDisplayContext.java
@@ -40,13 +40,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Sbarra
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/helper/CommerceAccountRelRequestHelper.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/helper/CommerceAccountRelRequestHelper.java
index b20735d4a3c273..8d298bb1a64be1 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/helper/CommerceAccountRelRequestHelper.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/display/context/helper/CommerceAccountRelRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Crescenzo Rega
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultCommerceShippingOptionDataSetFDSDataProvider.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultCommerceShippingOptionDataSetFDSDataProvider.java
index 22c48ace912a1b..da1581db5db46f 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultCommerceShippingOptionDataSetFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultCommerceShippingOptionDataSetFDSDataProvider.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultCommerceShippingOptionFDSActionProvider.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultCommerceShippingOptionFDSActionProvider.java
index 3bbc91c4899b63..f2b8869bc0b999 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultCommerceShippingOptionFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultCommerceShippingOptionFDSActionProvider.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultUsersDataSetFDSDataProvider.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultUsersDataSetFDSDataProvider.java
index bec097d1898de3..2d085af5db8131 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultUsersDataSetFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultUsersDataSetFDSDataProvider.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.service.UserService;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultUsersFDSActionProvider.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultUsersFDSActionProvider.java
index b5642fcc1a6a85..d3acc17e754483 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultUsersFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/data/set/provider/AccountEntryDefaultUsersFDSActionProvider.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/taglib/servlet/taglib/AccountAddressQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/taglib/servlet/taglib/AccountAddressQualifiersScreenNavigationEntry.java
index 78947398be3642..f5259c6b885262 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/taglib/servlet/taglib/AccountAddressQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/taglib/servlet/taglib/AccountAddressQualifiersScreenNavigationEntry.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.service.AddressLocalService;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/taglib/servlet/taglib/AccountEntryCommerceChannelDefaultsScreenNavigationEntry.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/taglib/servlet/taglib/AccountEntryCommerceChannelDefaultsScreenNavigationEntry.java
index f36e1da339121c..724a1fb001914f 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/taglib/servlet/taglib/AccountEntryCommerceChannelDefaultsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/frontend/taglib/servlet/taglib/AccountEntryCommerceChannelDefaultsScreenNavigationEntry.java
@@ -29,14 +29,14 @@
import com.liferay.portal.kernel.service.UserService;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Objects;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/CommerceAccountPortlet.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/CommerceAccountPortlet.java
index 63b7730e9caaef..49a10737e1d174 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/CommerceAccountPortlet.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/CommerceAccountPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.account.web.internal.constants.CommerceAccountPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -20,8 +20,8 @@
property = {
"com.liferay.portlet.add-default-resource=true",
"com.liferay.portlet.display-category=category.hidden",
- "javax.portlet.name=" + CommerceAccountPortletKeys.COMMERCE_ACCOUNT,
- "javax.portlet.version=3.0"
+ "jakarta.portlet.name=" + CommerceAccountPortletKeys.COMMERCE_ACCOUNT,
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountAddressQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountAddressQualifiersMVCActionCommand.java
index 03fe1da886889d..4f59a6865d0176 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountAddressQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountAddressQualifiersMVCActionCommand.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,8 +28,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_entry/edit_account_address_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryCommerceShippingOptionMVCActionCommand.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryCommerceShippingOptionMVCActionCommand.java
index 4210b40290ad72..6e95fd06b2608d 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryCommerceShippingOptionMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryCommerceShippingOptionMVCActionCommand.java
@@ -22,8 +22,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,8 +33,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_entries_admin/edit_account_entry_commerce_shipping_option"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryCommerceShippingOptionMVCRenderCommand.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryCommerceShippingOptionMVCRenderCommand.java
index bfd68bf8ef6c83..fa8748f73bca67 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryCommerceShippingOptionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryCommerceShippingOptionMVCRenderCommand.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -43,8 +43,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_entries_admin/edit_account_entry_commerce_shipping_option"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryUserMVCActionCommand.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryUserMVCActionCommand.java
index 25fff3200e4c40..e4bc22270f3258 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryUserMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryUserMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_entries_admin/edit_account_entry_user"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryUserMVCRenderCommand.java b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryUserMVCRenderCommand.java
index f474da8229d7a1..530a9c21da119b 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryUserMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-account-web/src/main/java/com/liferay/commerce/account/web/internal/portlet/action/EditAccountEntryUserMVCRenderCommand.java
@@ -22,13 +22,13 @@
import com.liferay.portal.kernel.service.UserService;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,8 +40,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/account_entries_admin/edit_account_entry_user"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-account-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-account-web/src/main/resources/META-INF/resources/init.jsp
index 2e6883b0c33728..98ab5aab90f90e 100644
--- a/modules/apps/commerce/commerce-account-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-account-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-address-content-web/build.gradle b/modules/apps/commerce/commerce-address-content-web/build.gradle
index 0f8546b918c4be..2a0247a3bbdc67 100644
--- a/modules/apps/commerce/commerce-address-content-web/build.gradle
+++ b/modules/apps/commerce/commerce-address-content-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/display/context/CommerceAddressDisplayContext.java b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/display/context/CommerceAddressDisplayContext.java
index fe06b301fce79d..a510876b27c32b 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/display/context/CommerceAddressDisplayContext.java
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/display/context/CommerceAddressDisplayContext.java
@@ -34,11 +34,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/exportimport/portlet/preferences/processor/CommerceAddressContentExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/exportimport/portlet/preferences/processor/CommerceAddressContentExportImportPortletPreferencesProcessor.java
index fc4bb584d8ca54..c15146424c6f2f 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/exportimport/portlet/preferences/processor/CommerceAddressContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/exportimport/portlet/preferences/processor/CommerceAddressContentExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Fabio Monaco
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
service = ExportImportPortletPreferencesProcessor.class
)
public class CommerceAddressContentExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/CommerceAddressContentPortlet.java b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/CommerceAddressContentPortlet.java
index 71f3dd83e7618b..3cff7015095c81 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/CommerceAddressContentPortlet.java
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/CommerceAddressContentPortlet.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,13 +44,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Commerce Addresses",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Commerce Addresses",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/CommerceAddressContentConfigurationAction.java b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/CommerceAddressContentConfigurationAction.java
index 973a83fc38ee7a..32aeb05a031f83 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/CommerceAddressContentConfigurationAction.java
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/CommerceAddressContentConfigurationAction.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
service = ConfigurationAction.class
)
public class CommerceAddressContentConfigurationAction
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/EditCommerceAddressMVCActionCommand.java b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/EditCommerceAddressMVCActionCommand.java
index c12948365fafad..3835e974b4988b 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/EditCommerceAddressMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/EditCommerceAddressMVCActionCommand.java
@@ -23,8 +23,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
"mvc.command.name=/commerce_address_content/edit_commerce_address"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/EditCommerceAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/EditCommerceAddressMVCRenderCommand.java
index d85112aec000f8..44d6802c17b24f 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/EditCommerceAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/EditCommerceAddressMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
"mvc.command.name=/commerce_address_content/edit_commerce_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/helper/ActionHelper.java b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/helper/ActionHelper.java
index c13938d7037349..009fe8620120d7 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/helper/ActionHelper.java
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/action/helper/ActionHelper.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/display/template/CommerceAddressContentPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/display/template/CommerceAddressContentPortletDisplayTemplateHandler.java
index 32d02c324f30f6..26b15057e4ab59 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/display/template/CommerceAddressContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/java/com/liferay/commerce/address/content/web/internal/portlet/display/template/CommerceAddressContentPortletDisplayTemplateHandler.java
@@ -33,7 +33,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ADDRESS_CONTENT,
service = TemplateHandler.class
)
public class CommerceAddressContentPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-address-content-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-address-content-web/src/main/resources/META-INF/resources/init.jsp
index daf7f802182ff4..4ced20d6971a5e 100644
--- a/modules/apps/commerce/commerce-address-content-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-address-content-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -44,9 +44,9 @@ page import="com.liferay.portal.kernel.util.PortalUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %>
-<%@ page import="java.util.Map" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
-<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="java.util.Map" %>
diff --git a/modules/apps/commerce/commerce-address-web/build.gradle b/modules/apps/commerce/commerce-address-web/build.gradle
index 296d22e1123142..51a13184ae00c1 100644
--- a/modules/apps/commerce/commerce-address-web/build.gradle
+++ b/modules/apps/commerce/commerce-address-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
index 01be4650954b23..0d8fd4253043c4 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
@@ -29,11 +29,11 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/CountryCommerceChannelDisplayContext.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/CountryCommerceChannelDisplayContext.java
index 0d4156adf98b4b..a835c589ee5b1a 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/CountryCommerceChannelDisplayContext.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/CountryCommerceChannelDisplayContext.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.service.CountryService;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/helper/CommerceAddressRequestHelper.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/helper/CommerceAddressRequestHelper.java
index 773e9a81819a6a..e20c799f9241cd 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/helper/CommerceAddressRequestHelper.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/display/context/helper/CommerceAddressRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/data/set/provider/AddressCommerceChannelAccountEntryRelFDSActionProvider.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/data/set/provider/AddressCommerceChannelAccountEntryRelFDSActionProvider.java
index bb156603177e8b..a30aeb1595ac1c 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/data/set/provider/AddressCommerceChannelAccountEntryRelFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/data/set/provider/AddressCommerceChannelAccountEntryRelFDSActionProvider.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/data/set/provider/AddressCommerceChannelAccountEntryRelFDSDataProvider.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/data/set/provider/AddressCommerceChannelAccountEntryRelFDSDataProvider.java
index 2815ee13b647ca..88a3350980ef41 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/data/set/provider/AddressCommerceChannelAccountEntryRelFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/data/set/provider/AddressCommerceChannelAccountEntryRelFDSDataProvider.java
@@ -27,9 +27,9 @@
import com.liferay.portal.kernel.util.HtmlUtil;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/taglib/servlet/taglib/CountryCommerceChannelsScreenNavigationEntry.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/taglib/servlet/taglib/CountryCommerceChannelsScreenNavigationEntry.java
index 0124e52bf4b875..312071456ddc26 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/taglib/servlet/taglib/CountryCommerceChannelsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/frontend/taglib/servlet/taglib/CountryCommerceChannelsScreenNavigationEntry.java
@@ -15,11 +15,11 @@
import com.liferay.portal.kernel.service.CountryService;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditAccountEntryDefaultCommerceAddressMVCActionCommand.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditAccountEntryDefaultCommerceAddressMVCActionCommand.java
index 9d571fa751ff81..508d8972e872b7 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditAccountEntryDefaultCommerceAddressMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditAccountEntryDefaultCommerceAddressMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,8 +29,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_address/edit_account_entry_default_commerce_address"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditAccountEntryDefaultCommerceAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditAccountEntryDefaultCommerceAddressMVCRenderCommand.java
index a6f6b1f3ee396d..d96448a8be3590 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditAccountEntryDefaultCommerceAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditAccountEntryDefaultCommerceAddressMVCRenderCommand.java
@@ -19,13 +19,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,8 +37,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_address/edit_account_entry_default_commerce_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditCountryCommerceChannelMVCActionCommand.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditCountryCommerceChannelMVCActionCommand.java
index 2713dde9442140..e531f2840b6438 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditCountryCommerceChannelMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/portlet/action/EditCountryCommerceChannelMVCActionCommand.java
@@ -23,10 +23,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import java.util.concurrent.Callable;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.concurrent.Callable;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceAddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
+ "jakarta.portlet.name=" + CommerceAddressPortletKeys.COUNTRIES_MANAGEMENT_ADMIN,
"mvc.command.name=/country/edit_country_commerce_channel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/servlet/taglib/DefaultAddressesJSPDynamicInclude.java b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/servlet/taglib/DefaultAddressesJSPDynamicInclude.java
index 973aaa9834a1b9..1ff38192611b25 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/servlet/taglib/DefaultAddressesJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-address-web/src/main/java/com/liferay/commerce/address/web/internal/servlet/taglib/DefaultAddressesJSPDynamicInclude.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-address-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-address-web/src/main/resources/META-INF/resources/init.jsp
index b3c508557f9be2..318556ac0b3e10 100644
--- a/modules/apps/commerce/commerce-address-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-address-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-api/build.gradle b/modules/apps/commerce/commerce-api/build.gradle
index dd781c2f6db8a5..523658233816b0 100644
--- a/modules/apps/commerce/commerce-api/build.gradle
+++ b/modules/apps/commerce/commerce-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/checkout/helper/CommerceCheckoutStepHttpHelper.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/checkout/helper/CommerceCheckoutStepHttpHelper.java
index 5e5a0f762b5249..da7bc7e7b91dd4 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/checkout/helper/CommerceCheckoutStepHttpHelper.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/checkout/helper/CommerceCheckoutStepHttpHelper.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.model.CommerceOrder;
import com.liferay.portal.kernel.exception.PortalException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/BaseCommerceContextHttp.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/BaseCommerceContextHttp.java
index adf3abdb9efb3f..485f02d6e85ba4 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/BaseCommerceContextHttp.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/BaseCommerceContextHttp.java
@@ -42,13 +42,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/CommerceContextFactory.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/CommerceContextFactory.java
index 22b0266c9a1302..e3dd898e222c63 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/CommerceContextFactory.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/context/CommerceContextFactory.java
@@ -5,7 +5,7 @@
package com.liferay.commerce.context;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/health/status/CommerceHealthStatus.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/health/status/CommerceHealthStatus.java
index 125d9a688500c8..72e398c36b5a7a 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/health/status/CommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/health/status/CommerceHealthStatus.java
@@ -7,9 +7,9 @@
import com.liferay.portal.kernel.exception.PortalException;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/CommerceOrderHttpHelper.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/CommerceOrderHttpHelper.java
index 7485ae7c3ef0ba..9d5dca391d6ae3 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/CommerceOrderHttpHelper.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/CommerceOrderHttpHelper.java
@@ -8,12 +8,12 @@
import com.liferay.commerce.model.CommerceOrder;
import com.liferay.portal.kernel.exception.PortalException;
-import java.math.BigDecimal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/importer/type/CommerceOrderImporterType.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/importer/type/CommerceOrderImporterType.java
index b82b212762f1cd..981c838b066bf3 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/importer/type/CommerceOrderImporterType.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/order/importer/type/CommerceOrderImporterType.java
@@ -10,14 +10,14 @@
import com.liferay.frontend.data.set.provider.search.FDSPagination;
import com.liferay.portal.kernel.exception.PortalException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/engine/CommercePaymentEngine.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/engine/CommercePaymentEngine.java
index c2fc245083e373..60bdace56c8c59 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/engine/CommercePaymentEngine.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/engine/CommercePaymentEngine.java
@@ -11,11 +11,11 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.theme.ThemeDisplay;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Luca Pellizzon
*/
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/engine/CommerceSubscriptionEngine.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/engine/CommerceSubscriptionEngine.java
index f154d20b921672..2a5b5261d77ddd 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/engine/CommerceSubscriptionEngine.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/engine/CommerceSubscriptionEngine.java
@@ -7,7 +7,7 @@
import com.liferay.commerce.payment.result.CommercePaymentResult;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/request/CommercePaymentRequestProvider.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/request/CommercePaymentRequestProvider.java
index 0542507ed98596..d59310ae48a89f 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/request/CommercePaymentRequestProvider.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/payment/request/CommercePaymentRequestProvider.java
@@ -7,9 +7,9 @@
import com.liferay.portal.kernel.exception.PortalException;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/BaseCommerceCheckoutStep.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/BaseCommerceCheckoutStep.java
index 176fd50244cae7..a8f0d208cb1e93 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/BaseCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/BaseCommerceCheckoutStep.java
@@ -8,12 +8,12 @@
import com.liferay.portal.kernel.language.LanguageUtil;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Andrea Di Giorgi
*/
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceAccountHelper.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceAccountHelper.java
index 14d42f13e70b91..d0ae0d47711b74 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceAccountHelper.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceAccountHelper.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.module.configuration.ConfigurationException;
import com.liferay.portal.kernel.service.ServiceContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceCheckoutStep.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceCheckoutStep.java
index c059a419c0b3f6..092c8a4830fc0a 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceCheckoutStep.java
@@ -5,13 +5,13 @@
package com.liferay.commerce.util;
-import java.util.Locale;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceCheckoutStepRegistry.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceCheckoutStepRegistry.java
index 4a9395bfa0470e..25476c52b97148 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceCheckoutStepRegistry.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceCheckoutStepRegistry.java
@@ -5,10 +5,10 @@
package com.liferay.commerce.util;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceOrderInfoItemUtil.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceOrderInfoItemUtil.java
index 89515ac8001f26..5625c0b6b255b2 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceOrderInfoItemUtil.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceOrderInfoItemUtil.java
@@ -23,7 +23,7 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Gianmarco Brunialti Masera
diff --git a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceOrderItemQuantityFormatter.java b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceOrderItemQuantityFormatter.java
index 987ab159f4129a..95ab19c123b1b2 100644
--- a/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceOrderItemQuantityFormatter.java
+++ b/modules/apps/commerce/commerce-api/src/main/java/com/liferay/commerce/util/CommerceOrderItemQuantityFormatter.java
@@ -9,12 +9,12 @@
import com.liferay.commerce.product.model.CPInstanceUnitOfMeasure;
import com.liferay.portal.kernel.exception.PortalException;
+import jakarta.portlet.ActionRequest;
+
import java.math.BigDecimal;
import java.util.Locale;
-import javax.portlet.ActionRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-application-list/build.gradle b/modules/apps/commerce/commerce-application-list/build.gradle
index e0ccc3bce78ff7..6c2956596a7c3d 100644
--- a/modules/apps/commerce/commerce-application-list/build.gradle
+++ b/modules/apps/commerce/commerce-application-list/build.gradle
@@ -1,6 +1,6 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:portal-search:portal-search-api")
diff --git a/modules/apps/commerce/commerce-availability-estimate-web/build.gradle b/modules/apps/commerce/commerce-availability-estimate-web/build.gradle
index 60b593dc033e22..06425c29afd27a 100644
--- a/modules/apps/commerce/commerce-availability-estimate-web/build.gradle
+++ b/modules/apps/commerce/commerce-availability-estimate-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/application/list/CommerceAvailabilityEstimatePanelApp.java b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/application/list/CommerceAvailabilityEstimatePanelApp.java
index 1736b78ed18786..26677ffa6b4b1b 100644
--- a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/application/list/CommerceAvailabilityEstimatePanelApp.java
+++ b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/application/list/CommerceAvailabilityEstimatePanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommercePortletKeys.COMMERCE_AVAILABILITY_ESTIMATE + ")"
+ target = "(jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_AVAILABILITY_ESTIMATE + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/display/context/CommerceAvailabilityEstimateDisplayContext.java b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/display/context/CommerceAvailabilityEstimateDisplayContext.java
index 7dff0287c82d21..3eb65bdbca7ebd 100644
--- a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/display/context/CommerceAvailabilityEstimateDisplayContext.java
+++ b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/display/context/CommerceAvailabilityEstimateDisplayContext.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/display/context/CommerceAvailabilityEstimateManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/display/context/CommerceAvailabilityEstimateManagementToolbarDisplayContext.java
index aeb24657208afd..b0d08ce3069627 100644
--- a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/display/context/CommerceAvailabilityEstimateManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/display/context/CommerceAvailabilityEstimateManagementToolbarDisplayContext.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/CommerceAvailabilityEstimatePortlet.java b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/CommerceAvailabilityEstimatePortlet.java
index 9d7761a66df108..2e506a5a8bf6d7 100644
--- a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/CommerceAvailabilityEstimatePortlet.java
+++ b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/CommerceAvailabilityEstimatePortlet.java
@@ -13,12 +13,12 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,13 +38,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Availability Estimates",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_AVAILABILITY_ESTIMATE,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Availability Estimates",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_AVAILABILITY_ESTIMATE,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/action/EditCommerceAvailabilityEstimateMVCActionCommand.java b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/action/EditCommerceAvailabilityEstimateMVCActionCommand.java
index 48377e7528e6a2..b073a65d4896c3 100644
--- a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/action/EditCommerceAvailabilityEstimateMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/action/EditCommerceAvailabilityEstimateMVCActionCommand.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_AVAILABILITY_ESTIMATE,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_AVAILABILITY_ESTIMATE,
"mvc.command.name=/commerce_availability_estimate/edit_commerce_availability_estimate"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/action/EditCommerceAvailabilityEstimateMVCRenderCommand.java b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/action/EditCommerceAvailabilityEstimateMVCRenderCommand.java
index ddaf39eb164bb9..c7b3b43ca4637d 100644
--- a/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/action/EditCommerceAvailabilityEstimateMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-availability-estimate-web/src/main/java/com/liferay/commerce/availability/estimate/web/internal/portlet/action/EditCommerceAvailabilityEstimateMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_AVAILABILITY_ESTIMATE,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_AVAILABILITY_ESTIMATE,
"mvc.command.name=/commerce_availability_estimate/edit_commerce_availability_estimate"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-availability-estimate-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-availability-estimate-web/src/main/resources/META-INF/resources/init.jsp
index ca50c69f312f00..815fe773e8ef4b 100644
--- a/modules/apps/commerce/commerce-availability-estimate-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-availability-estimate-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-cart-content-web/build.gradle b/modules/apps/commerce/commerce-cart-content-web/build.gradle
index 067a1058751d11..a517103487a8fe 100644
--- a/modules/apps/commerce/commerce-cart-content-web/build.gradle
+++ b/modules/apps/commerce/commerce-cart-content-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:adaptive-media:adaptive-media-image-taglib")
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentDisplayContext.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentDisplayContext.java
index d368f501038c59..5b546323eb7473 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentDisplayContext.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentDisplayContext.java
@@ -46,6 +46,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
@@ -53,10 +57,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentMiniDisplayContext.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentMiniDisplayContext.java
index c1fee42a0a10dc..b8464c4f07612a 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentMiniDisplayContext.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentMiniDisplayContext.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentTotalDisplayContext.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentTotalDisplayContext.java
index fe6cf2a1b0e31d..a588f78d547152 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentTotalDisplayContext.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/CommerceCartContentTotalDisplayContext.java
@@ -26,9 +26,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/helper/CommerceCartContentRequestHelper.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/helper/CommerceCartContentRequestHelper.java
index 418335f304d765..1d9c3a44e376c1 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/helper/CommerceCartContentRequestHelper.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/display/context/helper/CommerceCartContentRequestHelper.java
@@ -9,7 +9,7 @@
import com.liferay.commerce.context.CommerceContext;
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentExportImportPortletPreferencesProcessor.java
index 209a90c0f393c3..83c99bb3217b68 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Fabio Monaco
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
service = ExportImportPortletPreferencesProcessor.class
)
public class CommerceCartContentExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentMiniExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentMiniExportImportPortletPreferencesProcessor.java
index 6307948527b6f9..bbeb23e30343fe 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentMiniExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentMiniExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Fabio Monaco
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
service = ExportImportPortletPreferencesProcessor.class
)
public class CommerceCartContentMiniExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentTotalExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentTotalExportImportPortletPreferencesProcessor.java
index 2a5fdda2603717..45bac969fe51d2 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentTotalExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/exportimport/portlet/preferences/processor/CommerceCartContentTotalExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Fabio Monaco
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
service = ExportImportPortletPreferencesProcessor.class
)
public class CommerceCartContentTotalExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentMiniPortlet.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentMiniPortlet.java
index d63bd68871dfee..73a06dbf036b9c 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentMiniPortlet.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentMiniPortlet.java
@@ -28,12 +28,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -53,13 +53,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=false",
- "javax.portlet.display-name=Mini Cart",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/cart_mini/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Mini Cart",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/cart_mini/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentPortlet.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentPortlet.java
index b2e61867d9c552..75b6f4db35da0b 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentPortlet.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentPortlet.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -52,12 +52,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=false",
- "javax.portlet.display-name=Cart", "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/cart/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Cart",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/cart/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentTotalPortlet.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentTotalPortlet.java
index c8dae987ec22ad..12eed4db15994d 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentTotalPortlet.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/CommerceCartContentTotalPortlet.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -51,13 +51,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=false",
- "javax.portlet.display-name=Cart Summary",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/cart_total/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Cart Summary",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/cart_total/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/AddCommerceOrderItemMVCActionCommand.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/AddCommerceOrderItemMVCActionCommand.java
index 7f3689c96a77ee..472b4a3e211c4c 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/AddCommerceOrderItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/AddCommerceOrderItemMVCActionCommand.java
@@ -31,15 +31,15 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.math.BigDecimal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.math.BigDecimal;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,8 +49,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
"mvc.command.name=/commerce_cart_content/add_commerce_order_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentConfigurationAction.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentConfigurationAction.java
index 094dd33e69df1a..c8fa58f5cda985 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentConfigurationAction.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentConfigurationAction.java
@@ -26,10 +26,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
service = ConfigurationAction.class
)
public class CommerceCartContentConfigurationAction
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentMiniConfigurationAction.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentMiniConfigurationAction.java
index ca6f23d8d15369..388e305d1ec6c6 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentMiniConfigurationAction.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentMiniConfigurationAction.java
@@ -28,10 +28,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,7 +41,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
service = ConfigurationAction.class
)
public class CommerceCartContentMiniConfigurationAction
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentTotalConfigurationAction.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentTotalConfigurationAction.java
index d1522f491dc5de..d6d38984af1ded 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentTotalConfigurationAction.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/CommerceCartContentTotalConfigurationAction.java
@@ -27,10 +27,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
service = ConfigurationAction.class
)
public class CommerceCartContentTotalConfigurationAction
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
index 02501cd3acbd40..5260865d7cd238 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
@@ -21,8 +21,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,8 +32,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
"mvc.command.name=/commerce_cart_content/edit_commerce_order_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/helper/ActionHelper.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/helper/ActionHelper.java
index fc92c6f884604f..9e0c086c0a5d08 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/helper/ActionHelper.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/action/helper/ActionHelper.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentMiniPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentMiniPortletDisplayTemplateHandler.java
index e5c20e1c8fac97..9ad2d315af81a1 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentMiniPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentMiniPortletDisplayTemplateHandler.java
@@ -32,7 +32,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
service = TemplateHandler.class
)
public class CommerceCartContentMiniPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentPortletDisplayTemplateHandler.java
index 3d1eec5725f447..0957f58c574607 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentPortletDisplayTemplateHandler.java
@@ -32,7 +32,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT,
service = TemplateHandler.class
)
public class CommerceCartContentPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentTotalPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentTotalPortletDisplayTemplateHandler.java
index d69ef60acdc5ab..9ae15a34f5f1ef 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentTotalPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/portlet/display/template/CommerceCartContentTotalPortletDisplayTemplateHandler.java
@@ -32,7 +32,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
service = TemplateHandler.class
)
public class CommerceCartContentTotalPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/servlet/taglib/AddToCartButtonJSPDynamicInclude.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/servlet/taglib/AddToCartButtonJSPDynamicInclude.java
index a45624749e2b93..391f4c865e90dd 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/servlet/taglib/AddToCartButtonJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/servlet/taglib/AddToCartButtonJSPDynamicInclude.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.servlet.taglib.BaseJSPDynamicInclude;
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/template/CommerceCartTemplateContextContributor.java b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/template/CommerceCartTemplateContextContributor.java
index 79ca0f8907fd45..d3f39a5a3d275e 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/template/CommerceCartTemplateContextContributor.java
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/java/com/liferay/commerce/cart/content/web/internal/template/CommerceCartTemplateContextContributor.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.order.CommerceOrderHttpHelper;
import com.liferay.portal.kernel.template.TemplateContextContributor;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-cart-content-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-cart-content-web/src/main/resources/META-INF/resources/init.jsp
index 70a899df36dcfa..8c44f457a5db1f 100644
--- a/modules/apps/commerce/commerce-cart-content-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-cart-content-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -57,13 +57,13 @@ page import="com.liferay.portal.kernel.util.PortalUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.util.ArrayList" %><%@
page import="java.util.List" %><%@
page import="java.util.Map" %><%@
page import="java.util.StringJoiner" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-cart-taglib/build.gradle b/modules/apps/commerce/commerce-cart-taglib/build.gradle
index 2329569e9482d5..d9b710adcf91fc 100644
--- a/modules/apps/commerce/commerce-cart-taglib/build.gradle
+++ b/modules/apps/commerce/commerce-cart-taglib/build.gradle
@@ -2,15 +2,15 @@ dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.apache.cxf.core", version: "3.5.10.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.apache.cxf.rt.frontend.jaxrs", version: "3.5.10.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.apache.cxf.rt.rs.extension.providers", version: "3.5.10.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.cxf", name: "cxf-core", version: "3.5.10"
- compileOnly group: "org.apache.cxf", name: "cxf-rt-frontend-jaxrs", version: "3.5.10"
- compileOnly group: "org.apache.cxf", name: "cxf-rt-rs-extension-providers", version: "3.5.10"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.jaxrs", version: "1.0.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-cart-taglib/src/main/java/com/liferay/commerce/cart/taglib/servlet/taglib/QuantityControlTag.java b/modules/apps/commerce/commerce-cart-taglib/src/main/java/com/liferay/commerce/cart/taglib/servlet/taglib/QuantityControlTag.java
index 63dca40153cff9..f232c45f0c19be 100644
--- a/modules/apps/commerce/commerce-cart-taglib/src/main/java/com/liferay/commerce/cart/taglib/servlet/taglib/QuantityControlTag.java
+++ b/modules/apps/commerce/commerce-cart-taglib/src/main/java/com/liferay/commerce/cart/taglib/servlet/taglib/QuantityControlTag.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.module.service.Snapshot;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-cart-taglib/src/main/resources/META-INF/resources/quantity_control/init.jsp b/modules/apps/commerce/commerce-cart-taglib/src/main/resources/META-INF/resources/quantity_control/init.jsp
index 5578667fb278a7..2a6ed488def533 100644
--- a/modules/apps/commerce/commerce-cart-taglib/src/main/resources/META-INF/resources/quantity_control/init.jsp
+++ b/modules/apps/commerce/commerce-cart-taglib/src/main/resources/META-INF/resources/quantity_control/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
taglib uri="http://liferay.com/tld/commerce" prefix="liferay-commerce" %><%@
diff --git a/modules/apps/commerce/commerce-catalog-web/build.gradle b/modules/apps/commerce/commerce-catalog-web/build.gradle
index 6733d321ba3e11..3af79a3ab4f44c 100644
--- a/modules/apps/commerce/commerce-catalog-web/build.gradle
+++ b/modules/apps/commerce/commerce-catalog-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/application/list/CommerceCatalogPanelApp.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/application/list/CommerceCatalogPanelApp.java
index 5f3a76987cc084..8c8f421edbae3a 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/application/list/CommerceCatalogPanelApp.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/application/list/CommerceCatalogPanelApp.java
@@ -38,7 +38,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/display/context/CommerceCatalogDisplayContext.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/display/context/CommerceCatalogDisplayContext.java
index 7073febd1a751a..f524261712e768 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/display/context/CommerceCatalogDisplayContext.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/display/context/CommerceCatalogDisplayContext.java
@@ -57,18 +57,18 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.RenderURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-import javax.portlet.RenderURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alec Sloan
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogAccountGroupsFDSDataProvider.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogAccountGroupsFDSDataProvider.java
index f45a85bede7ef7..2be4e9f7d2ec38 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogAccountGroupsFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogAccountGroupsFDSDataProvider.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogChannelsFDSDataProvider.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogChannelsFDSDataProvider.java
index ee83f4df022488..19df2f053b7b25 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogChannelsFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogChannelsFDSDataProvider.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogFDSActionProvider.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogFDSActionProvider.java
index 62d98de3ced7fe..1610cdd9fedb7a 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogFDSActionProvider.java
@@ -25,14 +25,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogFDSDataProvider.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogFDSDataProvider.java
index 176b3e6f8e9014..69595d4c82b61e 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/data/set/provider/CommerceCatalogFDSDataProvider.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogAccountGroupsScreenNavigationEntry.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogAccountGroupsScreenNavigationEntry.java
index 70adad12b2a86e..daf4ee4082fc70 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogAccountGroupsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogAccountGroupsScreenNavigationEntry.java
@@ -10,10 +10,10 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.model.User;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogChannelsScreenNavigationEntry.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogChannelsScreenNavigationEntry.java
index ac01f59df6fa9d..cba18ae9610478 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogChannelsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogChannelsScreenNavigationEntry.java
@@ -10,10 +10,10 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.model.User;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogDetailsScreenNavigationEntry.java
index 0d690cb913e6c2..5547c1667000d9 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/frontend/taglib/servlet/taglib/CommerceCatalogDetailsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/CommerceCatalogsPortlet.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/CommerceCatalogsPortlet.java
index 9c7bf94f7c0469..88ad4db3701fa9 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/CommerceCatalogsPortlet.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/CommerceCatalogsPortlet.java
@@ -24,15 +24,15 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.io.IOException;
import java.util.Map;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
@@ -54,13 +54,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Catalogs",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Catalogs",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/AddCommerceCatalogMVCRenderCommand.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/AddCommerceCatalogMVCRenderCommand.java
index 0b420ec1c9895a..0cfead498e2fb9 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/AddCommerceCatalogMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/AddCommerceCatalogMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
"mvc.command.name=/commerce_catalogs/add_commerce_catalog"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogExternalReferenceCodeMVCActionCommand.java
index 4c1f1711955cb8..f7757b70dd843f 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogExternalReferenceCodeMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
"mvc.command.name=/commerce_catalogs/edit_commerce_catalog_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogExternalReferenceCodeMVCRenderCommand.java
index e1f9bfa57092a9..83c672c2608762 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogExternalReferenceCodeMVCRenderCommand.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -41,7 +41,7 @@
@Component(
configurationPid = "com.liferay.commerce.product.configuration.AttachmentsConfiguration",
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
"mvc.command.name=/commerce_catalogs/edit_commerce_catalog_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogMVCActionCommand.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogMVCActionCommand.java
index 62d6964f865fe7..a96f0dafb761cf 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogMVCActionCommand.java
@@ -42,13 +42,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PropertiesParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -57,7 +57,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
"mvc.command.name=/commerce_catalogs/edit_commerce_catalog"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogMVCRenderCommand.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogMVCRenderCommand.java
index 87b2d733176152..5ba38b8f8ca591 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/EditCommerceCatalogMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
"mvc.command.name=/commerce_catalogs/edit_commerce_catalog"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/UploadCommerceMediaDefaultImageMVCActionCommand.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/UploadCommerceMediaDefaultImageMVCActionCommand.java
index fc2d91d97c38ab..e4b42e8fa849d1 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/UploadCommerceMediaDefaultImageMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/portlet/action/UploadCommerceMediaDefaultImageMVCActionCommand.java
@@ -33,15 +33,15 @@
import com.liferay.upload.UploadHandler;
import com.liferay.upload.UploadResponseHandler;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -53,7 +53,7 @@
@Component(
configurationPid = "com.liferay.commerce.product.configuration.AttachmentsConfiguration",
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CATALOGS,
"mvc.command.name=/commerce_catalogs/upload_commerce_media_default_image"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/search/CommerceCatalogChecker.java b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/search/CommerceCatalogChecker.java
index 3f0cdb036389f7..32b2791631cc7b 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/search/CommerceCatalogChecker.java
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/java/com/liferay/commerce/catalog/web/internal/search/CommerceCatalogChecker.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.product.model.CommerceCatalog;
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Alec Sloan
diff --git a/modules/apps/commerce/commerce-catalog-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-catalog-web/src/main/resources/META-INF/resources/init.jsp
index 17a001e354d428..6e79c735e91211 100644
--- a/modules/apps/commerce/commerce-catalog-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-catalog-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -48,12 +48,12 @@ page import="com.liferay.portal.kernel.util.HtmlUtil" %><%@
page import="com.liferay.portal.kernel.util.LocaleUtil" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.util.List" %><%@
page import="java.util.Locale" %><%@
page import="java.util.Set" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-channel-web/build.gradle b/modules/apps/commerce/commerce-channel-web/build.gradle
index 0b004ea797ab2e..4a8aa8261fe967 100644
--- a/modules/apps/commerce/commerce-channel-web/build.gradle
+++ b/modules/apps/commerce/commerce-channel-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/application/list/CommerceChannelPanelApp.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/application/list/CommerceChannelPanelApp.java
index 51f644edff17a3..70c12b2b314e68 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/application/list/CommerceChannelPanelApp.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/application/list/CommerceChannelPanelApp.java
@@ -38,7 +38,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/BaseCommerceChannelDisplayContext.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/BaseCommerceChannelDisplayContext.java
index 5b1f8ffec4edd7..952cbc843b409c 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/BaseCommerceChannelDisplayContext.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/BaseCommerceChannelDisplayContext.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alec Sloan
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelAccountEntryQualifiersDisplayContext.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelAccountEntryQualifiersDisplayContext.java
index 2b6a64f1ec6e71..8a836a13af96ce 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelAccountEntryQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelAccountEntryQualifiersDisplayContext.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.settings.GroupServiceSettingsLocator;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Danny Situ
*/
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelCommerceCurrencyDisplayContext.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelCommerceCurrencyDisplayContext.java
index 9e5cd12d337eaa..c35d8f54f1a181 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelCommerceCurrencyDisplayContext.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelCommerceCurrencyDisplayContext.java
@@ -30,9 +30,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import java.util.HashMap;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
/**
* @author Fabio Monaco
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelCountryDisplayContext.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelCountryDisplayContext.java
index dd8e33a47cf8d2..1564f32d147b8f 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelCountryDisplayContext.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelCountryDisplayContext.java
@@ -30,9 +30,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import java.util.HashMap;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
/**
* @author Stefano Motta
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelDisplayContext.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelDisplayContext.java
index ff1273532dd27a..a9f2de4053f856 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelDisplayContext.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/CommerceChannelDisplayContext.java
@@ -68,16 +68,16 @@
import com.liferay.portal.kernel.workflow.WorkflowDefinition;
import com.liferay.portal.workflow.manager.WorkflowDefinitionManager;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alec Sloan
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/SiteCommerceChannelTypeDisplayContext.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/SiteCommerceChannelTypeDisplayContext.java
index 3777061ada5142..f28e14e9350c17 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/SiteCommerceChannelTypeDisplayContext.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/SiteCommerceChannelTypeDisplayContext.java
@@ -28,9 +28,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.workflow.manager.WorkflowDefinitionManager;
-import java.util.Collections;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
/**
* @author Alec Sloan
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/helper/CommerceChannelRequestHelper.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/helper/CommerceChannelRequestHelper.java
index 71e864ba76abee..e216b93b3a03dc 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/helper/CommerceChannelRequestHelper.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/display/context/helper/CommerceChannelRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCommerceCurrencyFDSActionProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCommerceCurrencyFDSActionProvider.java
index fa1efcc9feebdd..b1801925036adf 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCommerceCurrencyFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCommerceCurrencyFDSActionProvider.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCommerceCurrencyFDSDataProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCommerceCurrencyFDSDataProvider.java
index d230b2adf310e4..f2d70872391634 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCommerceCurrencyFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCommerceCurrencyFDSDataProvider.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCountryFDSActionProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCountryFDSActionProvider.java
index bf65117c0077e1..704fd4f1f7c038 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCountryFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCountryFDSActionProvider.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCountryFDSDataProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCountryFDSDataProvider.java
index bd589ef099caff..91d05f88c16ba0 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCountryFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelCountryFDSDataProvider.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelFDSActionProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelFDSActionProvider.java
index 54fe3e17b9bd28..142f56c0abea44 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelFDSActionProvider.java
@@ -24,14 +24,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelFDSDataProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelFDSDataProvider.java
index 15b57cc41590c7..270616de8fa9f7 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelFDSDataProvider.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelHealthCheckFDSActionProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelHealthCheckFDSActionProvider.java
index 14a34f570480a6..d35e412b73b989 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelHealthCheckFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelHealthCheckFDSActionProvider.java
@@ -18,13 +18,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
-import java.util.List;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.ResourceBundle;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelHealthCheckFDSDataProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelHealthCheckFDSDataProvider.java
index 74062e06708b76..83a99a466a875f 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelHealthCheckFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceChannelHealthCheckFDSDataProvider.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSActionProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSActionProvider.java
index d72d862484f8ad..884d621d615c61 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSActionProvider.java
@@ -28,12 +28,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSDataProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSDataProvider.java
index 40dbbba3e4aca1..a3b4e731952469 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSDataProvider.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceShippingMethodFDSActionProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceShippingMethodFDSActionProvider.java
index 572aa52977b104..dd6a54e05c0020 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceShippingMethodFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceShippingMethodFDSActionProvider.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceShippingMethodFDSDataProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceShippingMethodFDSDataProvider.java
index d667c44c6dca2b..f051b114a5da09 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceShippingMethodFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceShippingMethodFDSDataProvider.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceTaxMethodFDSActionProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceTaxMethodFDSActionProvider.java
index 6bbb2943167cfc..af4119eec132aa 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceTaxMethodFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceTaxMethodFDSActionProvider.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceTaxMethodFDSDataProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceTaxMethodFDSDataProvider.java
index ae84f66e0137e1..0d1a7ed18eec07 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceTaxMethodFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/data/set/provider/CommerceTaxMethodFDSDataProvider.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelAccountEntryQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelAccountEntryQualifiersScreenNavigationEntry.java
index 96c7318702d4ba..1805214d40a3c6 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelAccountEntryQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelAccountEntryQualifiersScreenNavigationEntry.java
@@ -14,10 +14,10 @@
import com.liferay.portal.configuration.module.configuration.ConfigurationProvider;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCommerceCurrencyScreenNavigationEntry.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCommerceCurrencyScreenNavigationEntry.java
index ba5b28de83983c..5c3d03d8240b4b 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCommerceCurrencyScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCommerceCurrencyScreenNavigationEntry.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCountryScreenNavigationEntry.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCountryScreenNavigationEntry.java
index 04c09b592f0b89..00cc3dd3f36bce 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCountryScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCountryScreenNavigationEntry.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelGeneralScreenNavigationEntry.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelGeneralScreenNavigationEntry.java
index 7791eb84f51d68..2e5244df95c262 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelGeneralScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelGeneralScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelSiteScreenNavigationEntry.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelSiteScreenNavigationEntry.java
index 115124a84e6019..4f348d9e7e9a44 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelSiteScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/frontend/taglib/servlet/taglib/CommerceChannelSiteScreenNavigationEntry.java
@@ -26,10 +26,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.workflow.manager.WorkflowDefinitionManager;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/item/selector/CommerceCurrencyItemSelectorView.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/item/selector/CommerceCurrencyItemSelectorView.java
index 58b37fc848c278..539dcac606259c 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/item/selector/CommerceCurrencyItemSelectorView.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/item/selector/CommerceCurrencyItemSelectorView.java
@@ -26,6 +26,15 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
@@ -33,15 +42,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/item/selector/CountryItemSelectorView.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/item/selector/CountryItemSelectorView.java
index 9658c920f6442a..21489044503de8 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/item/selector/CountryItemSelectorView.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/item/selector/CountryItemSelectorView.java
@@ -26,6 +26,15 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
@@ -33,15 +42,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/CommerceChannelPortletProvider.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/CommerceChannelPortletProvider.java
index cb4b2bca3bcb4c..23e118cec3883e 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/CommerceChannelPortletProvider.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/CommerceChannelPortletProvider.java
@@ -12,10 +12,10 @@
import com.liferay.portal.kernel.portlet.PortletProvider;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/CommerceChannelsPortlet.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/CommerceChannelsPortlet.java
index 63bdcd24ac560d..174891d21f9f3b 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/CommerceChannelsPortlet.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/CommerceChannelsPortlet.java
@@ -24,12 +24,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.workflow.manager.WorkflowDefinitionManager;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -48,13 +48,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Channels",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Channels",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/AddCommerceChannelMVCRenderCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/AddCommerceChannelMVCRenderCommand.java
index f16db59d92b5e8..76e28a63444129 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/AddCommerceChannelMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/AddCommerceChannelMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/add_commerce_channel"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/CommerceChannelMVCRenderCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/CommerceChannelMVCRenderCommand.java
index a99208dcd6b0e5..cdcccd369a3428 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/CommerceChannelMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/CommerceChannelMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -18,7 +18,7 @@
* @author Alec Sloan
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
service = MVCRenderCommand.class
)
public class CommerceChannelMVCRenderCommand implements MVCRenderCommand {
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelCommerceCurrencyMVCActionCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelCommerceCurrencyMVCActionCommand.java
index df71b1c8ec2fc7..388ed9ef2f432d 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelCommerceCurrencyMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelCommerceCurrencyMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_channel_commerce_currency"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelCountryMVCActionCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelCountryMVCActionCommand.java
index bab6d8f8d1e366..35503f8b2c0c5e 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelCountryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelCountryMVCActionCommand.java
@@ -20,8 +20,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_channel_country"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelExternalReferenceCodeMVCActionCommand.java
index 9b84c122fbd9da..753a19dfb85133 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelExternalReferenceCodeMVCActionCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_channel_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelExternalReferenceCodeMVCRenderCommand.java
index 150d9aa56620ca..0d45493d3e825b 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_channel_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelHealthStatusMVCActionCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelHealthStatusMVCActionCommand.java
index 7bb7ed81c63de0..f5a92fe2377116 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelHealthStatusMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelHealthStatusMVCActionCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_channel_health_status"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelMVCActionCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelMVCActionCommand.java
index 7727a2a52085f6..cef3474a5baf66 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelMVCActionCommand.java
@@ -49,14 +49,14 @@
import com.liferay.portal.kernel.util.PropertiesParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -66,7 +66,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_channel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelMVCRenderCommand.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelMVCRenderCommand.java
index 380d96f2c44356..a94f39b1676697 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/portlet/action/EditCommerceChannelMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_channel"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/search/CommerceCurrencyItemSelectorChecker.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/search/CommerceCurrencyItemSelectorChecker.java
index 0c38dce0ff6393..71deb12772bc1b 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/search/CommerceCurrencyItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/search/CommerceCurrencyItemSelectorChecker.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.ArrayUtil;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderResponse;
/**
* @author Fabio Monaco
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/search/CountryItemSelectorChecker.java b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/search/CountryItemSelectorChecker.java
index 050c57c8f786b5..2b755513a0e956 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/search/CountryItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-channel-web/src/main/java/com/liferay/commerce/channel/web/internal/search/CountryItemSelectorChecker.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.model.Country;
import com.liferay.portal.kernel.util.ArrayUtil;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderResponse;
/**
* @author Stefano Motta
diff --git a/modules/apps/commerce/commerce-channel-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-channel-web/src/main/resources/META-INF/resources/init.jsp
index c27265cb0e856e..88e1986454b00d 100644
--- a/modules/apps/commerce/commerce-channel-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-channel-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-checkout-web/build.gradle b/modules/apps/commerce/commerce-checkout-web/build.gradle
index 02986f9b02c742..c305f0a110fac1 100644
--- a/modules/apps/commerce/commerce-checkout-web/build.gradle
+++ b/modules/apps/commerce/commerce-checkout-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/AddressCommerceCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/AddressCommerceCheckoutStepDisplayContext.java
index 7b017a8430daed..6354820c2c704a 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/AddressCommerceCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/AddressCommerceCheckoutStepDisplayContext.java
@@ -30,9 +30,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
-import javax.portlet.ActionRequest;
+import java.util.Objects;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/BaseAddressCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/BaseAddressCheckoutStepDisplayContext.java
index e7324e643b50b6..dc06fec6e737d7 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/BaseAddressCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/BaseAddressCheckoutStepDisplayContext.java
@@ -30,9 +30,9 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.PortalUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/BillingAddressCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/BillingAddressCheckoutStepDisplayContext.java
index 2ab0d1c57c6a08..5019e8c45d4253 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/BillingAddressCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/BillingAddressCheckoutStepDisplayContext.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/CheckoutDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/CheckoutDisplayContext.java
index c9954bfc76bef9..7e7debce8e4688 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/CheckoutDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/CheckoutDisplayContext.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.taglib.servlet.PipingServletResponseFactory;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/DeliveryGroupDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/DeliveryGroupDisplayContext.java
index c4bb3c4971ed4d..5683b2bbd2de2d 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/DeliveryGroupDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/DeliveryGroupDisplayContext.java
@@ -10,9 +10,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Date;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/OrderConfirmationCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/OrderConfirmationCheckoutStepDisplayContext.java
index 8b76ae92470868..b3d803c6815a32 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/OrderConfirmationCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/OrderConfirmationCheckoutStepDisplayContext.java
@@ -20,7 +20,7 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/OrderSummaryCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/OrderSummaryCheckoutStepDisplayContext.java
index c5efffbb52bcf3..51bd306fe7f8cd 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/OrderSummaryCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/OrderSummaryCheckoutStepDisplayContext.java
@@ -60,6 +60,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
@@ -69,8 +71,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
*/
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/PaymentMethodCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/PaymentMethodCheckoutStepDisplayContext.java
index b12a45179d461f..f47845c5fcf839 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/PaymentMethodCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/PaymentMethodCheckoutStepDisplayContext.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.util.ListUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Di Giorgi
*/
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/PaymentProcessCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/PaymentProcessCheckoutStepDisplayContext.java
index 6b8ce0af98f2ab..5a60897373c24d 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/PaymentProcessCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/PaymentProcessCheckoutStepDisplayContext.java
@@ -11,7 +11,7 @@
import com.liferay.headless.commerce.delivery.cart.resource.v1_0.CartResource;
import com.liferay.petra.string.StringPool;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/ShippingAddressCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/ShippingAddressCheckoutStepDisplayContext.java
index 43ae7266f9bed5..845681a64ae652 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/ShippingAddressCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/ShippingAddressCheckoutStepDisplayContext.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/ShippingMethodCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/ShippingMethodCheckoutStepDisplayContext.java
index 8956c0a19fcd48..c1f3ff0403ce5a 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/ShippingMethodCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/ShippingMethodCheckoutStepDisplayContext.java
@@ -31,14 +31,14 @@
import com.liferay.portal.kernel.util.BigDecimalUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Di Giorgi
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/TermCommerceCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/TermCommerceCheckoutStepDisplayContext.java
index becc166a13c4d2..0b5a4247b35e8a 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/TermCommerceCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/TermCommerceCheckoutStepDisplayContext.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Luca Pellizzon
*/
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/helper/CommerceCheckoutRequestHelper.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/helper/CommerceCheckoutRequestHelper.java
index 3655be48dccc5a..2fcae351babf03 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/helper/CommerceCheckoutRequestHelper.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/display/context/helper/CommerceCheckoutRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/data/set/provider/CommerceCheckoutDeliveryGroupsFDSActionProvider.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/data/set/provider/CommerceCheckoutDeliveryGroupsFDSActionProvider.java
index 7356fa10ce6464..2284e3044a93e1 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/data/set/provider/CommerceCheckoutDeliveryGroupsFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/data/set/provider/CommerceCheckoutDeliveryGroupsFDSActionProvider.java
@@ -21,11 +21,11 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/data/set/provider/CommerceCheckoutDeliveryGroupsFDSDataProvider.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/data/set/provider/CommerceCheckoutDeliveryGroupsFDSDataProvider.java
index f9ea65fdef858a..09d365480af45f 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/data/set/provider/CommerceCheckoutDeliveryGroupsFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/data/set/provider/CommerceCheckoutDeliveryGroupsFDSDataProvider.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/taglib/servlet/taglib/CommerceCheckoutOrderSummaryMultishippingScreenNavigationEntry.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/taglib/servlet/taglib/CommerceCheckoutOrderSummaryMultishippingScreenNavigationEntry.java
index 4f6cdb0f148209..1c413e501b85dc 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/taglib/servlet/taglib/CommerceCheckoutOrderSummaryMultishippingScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/taglib/servlet/taglib/CommerceCheckoutOrderSummaryMultishippingScreenNavigationEntry.java
@@ -29,11 +29,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/taglib/servlet/taglib/CommerceCheckoutOrderSummaryOrderItemsScreenNavigationEntry.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/taglib/servlet/taglib/CommerceCheckoutOrderSummaryOrderItemsScreenNavigationEntry.java
index 018cb5d8a1e0d0..10f9cad2ace6c2 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/taglib/servlet/taglib/CommerceCheckoutOrderSummaryOrderItemsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/frontend/taglib/servlet/taglib/CommerceCheckoutOrderSummaryOrderItemsScreenNavigationEntry.java
@@ -28,11 +28,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/helper/DefaultCommerceCheckoutStepHttpHelper.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/helper/DefaultCommerceCheckoutStepHttpHelper.java
index 506da41659bf5f..8d6c5c10a3abf9 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/helper/DefaultCommerceCheckoutStepHttpHelper.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/helper/DefaultCommerceCheckoutStepHttpHelper.java
@@ -66,12 +66,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/CommerceCheckoutPortlet.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/CommerceCheckoutPortlet.java
index 3a1e3ee09d56e2..ebaba7a0ddc85c 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/CommerceCheckoutPortlet.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/CommerceCheckoutPortlet.java
@@ -36,19 +36,19 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.io.IOException;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -69,13 +69,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Checkout",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Checkout",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/CommerceCheckoutPortletProvider.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/CommerceCheckoutPortletProvider.java
index 73fcdf16728e34..01926df24629a9 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/CommerceCheckoutPortletProvider.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/CommerceCheckoutPortletProvider.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/CheckoutRedirectMVCRenderCommand.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/CheckoutRedirectMVCRenderCommand.java
index 8d1d0e580e6fce..6617e25a9b5199 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/CheckoutRedirectMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/CheckoutRedirectMVCRenderCommand.java
@@ -12,13 +12,13 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
"mvc.command.name=/commerce_checkout/checkout_redirect"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/CommerceCheckoutConfigurationAction.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/CommerceCheckoutConfigurationAction.java
index c83edbb235e27b..3cd28be8cceb1a 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/CommerceCheckoutConfigurationAction.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/CommerceCheckoutConfigurationAction.java
@@ -19,15 +19,15 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
* @author Balázs Breier
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
service = ConfigurationAction.class
)
public class CommerceCheckoutConfigurationAction
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/SaveStepMVCActionCommand.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/SaveStepMVCActionCommand.java
index 4b72bbca10a7f0..2d46411f5bdb48 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/SaveStepMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/SaveStepMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
"mvc.command.name=/commerce_checkout/save_step"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/ViewCommerceCheckoutDeliveryGroupMVCRenderCommand.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/ViewCommerceCheckoutDeliveryGroupMVCRenderCommand.java
index f7d0c1d116c0f6..967946ae07add5 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/ViewCommerceCheckoutDeliveryGroupMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/action/ViewCommerceCheckoutDeliveryGroupMVCRenderCommand.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT,
"mvc.command.name=/commerce_checkout/view_commerce_checkout_delivery_group"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/route/CommerceCheckoutFriendlyURLMapper.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/route/CommerceCheckoutFriendlyURLMapper.java
index 348ee8734b2611..ae80d54a198a46 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/route/CommerceCheckoutFriendlyURLMapper.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/portlet/route/CommerceCheckoutFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/routes.xml",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CHECKOUT
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/BillingAddressCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/BillingAddressCommerceCheckoutStep.java
index 0502ec794a9fc7..ced0e656a8bfc1 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/BillingAddressCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/BillingAddressCommerceCheckoutStep.java
@@ -49,13 +49,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/CommerceCheckoutStepRegistryImpl.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/CommerceCheckoutStepRegistryImpl.java
index c3dcc2c9377ac6..0a4371ae16472d 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/CommerceCheckoutStepRegistryImpl.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/CommerceCheckoutStepRegistryImpl.java
@@ -17,14 +17,14 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/DeliveryTermCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/DeliveryTermCommerceCheckoutStep.java
index 4bb7a0d8f40e97..7a2ffc1657411b 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/DeliveryTermCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/DeliveryTermCommerceCheckoutStep.java
@@ -30,11 +30,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/OrderConfirmationCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/OrderConfirmationCommerceCheckoutStep.java
index 064a7179f81a0d..4ab885ef435450 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/OrderConfirmationCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/OrderConfirmationCommerceCheckoutStep.java
@@ -16,11 +16,11 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/OrderSummaryCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/OrderSummaryCommerceCheckoutStep.java
index a804a6c9b37354..b594b8e88cfc8a 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/OrderSummaryCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/OrderSummaryCommerceCheckoutStep.java
@@ -58,14 +58,14 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.math.BigDecimal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import java.math.BigDecimal;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentMethodCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentMethodCommerceCheckoutStep.java
index d30b95ac9e3e91..1c0fcdb5ca5850 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentMethodCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentMethodCommerceCheckoutStep.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentProcessCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentProcessCommerceCheckoutStep.java
index b26196bebc7731..076f40531106dd 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentProcessCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentProcessCommerceCheckoutStep.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentTermCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentTermCommerceCheckoutStep.java
index 6568182da819eb..6ef297e3aa0d60 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentTermCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/PaymentTermCommerceCheckoutStep.java
@@ -30,11 +30,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/ShippingAddressCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/ShippingAddressCommerceCheckoutStep.java
index fd1c637152762d..783291f359f2ce 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/ShippingAddressCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/ShippingAddressCommerceCheckoutStep.java
@@ -34,11 +34,11 @@
import com.liferay.portal.kernel.service.CountryLocalService;
import com.liferay.portal.kernel.servlet.SessionErrors;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/ShippingMethodCommerceCheckoutStep.java b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/ShippingMethodCommerceCheckoutStep.java
index 76852d4a739551..3e3123328d2fc8 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/ShippingMethodCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/java/com/liferay/commerce/checkout/web/internal/util/ShippingMethodCommerceCheckoutStep.java
@@ -42,18 +42,18 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.math.BigDecimal;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-checkout-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-checkout-web/src/main/resources/META-INF/resources/init.jsp
index ff8b70637b83ce..dc5a79dc77cf64 100644
--- a/modules/apps/commerce/commerce-checkout-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-checkout-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-client-extension-web/build.gradle b/modules/apps/commerce/commerce-client-extension-web/build.gradle
index 026579b85ae901..e13ca53c8dee4f 100644
--- a/modules/apps/commerce/commerce-client-extension-web/build.gradle
+++ b/modules/apps/commerce/commerce-client-extension-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:client-extension:client-extension-api")
diff --git a/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/type/deployer/CommerceCETDeployerImpl.java b/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/type/deployer/CommerceCETDeployerImpl.java
index d51c306f959a61..caf533016da71b 100644
--- a/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/type/deployer/CommerceCETDeployerImpl.java
+++ b/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/type/deployer/CommerceCETDeployerImpl.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.json.JSONFactory;
import com.liferay.portal.kernel.service.UserService;
+import jakarta.servlet.ServletContext;
+
import java.util.Arrays;
import java.util.List;
-import javax.servlet.ServletContext;
-
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/util/ClientExtensionCommerceCheckoutStep.java b/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/util/ClientExtensionCommerceCheckoutStep.java
index a0124b08d02c46..981773d9d03a6c 100644
--- a/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/util/ClientExtensionCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-client-extension-web/src/main/java/com/liferay/commerce/client/extension/web/internal/util/ClientExtensionCommerceCheckoutStep.java
@@ -29,18 +29,18 @@
import com.liferay.portal.kernel.util.UnicodeProperties;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionParameters;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Dictionary;
import java.util.Locale;
import java.util.Objects;
-import javax.portlet.ActionParameters;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Andrea Sbarra
*/
diff --git a/modules/apps/commerce/commerce-client-extension-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-client-extension-web/src/main/resources/META-INF/resources/init.jsp
index ff1a4d8c23cebf..7176d5ce7b9cdd 100644
--- a/modules/apps/commerce/commerce-client-extension-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-client-extension-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-currency-api/build.gradle b/modules/apps/commerce/commerce-currency-api/build.gradle
index be85dbc38145a6..29de546f3df664 100644
--- a/modules/apps/commerce/commerce-currency-api/build.gradle
+++ b/modules/apps/commerce/commerce-currency-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:static:portal-configuration:portal-configuration-metatype-api")
diff --git a/modules/apps/commerce/commerce-currency-api/src/main/java/com/liferay/commerce/currency/util/CommercePriceFormatter.java b/modules/apps/commerce/commerce-currency-api/src/main/java/com/liferay/commerce/currency/util/CommercePriceFormatter.java
index c2b479a46c8812..1ae03f19238327 100644
--- a/modules/apps/commerce/commerce-currency-api/src/main/java/com/liferay/commerce/currency/util/CommercePriceFormatter.java
+++ b/modules/apps/commerce/commerce-currency-api/src/main/java/com/liferay/commerce/currency/util/CommercePriceFormatter.java
@@ -8,12 +8,12 @@
import com.liferay.commerce.currency.model.CommerceCurrency;
import com.liferay.portal.kernel.exception.PortalException;
+import jakarta.portlet.ActionRequest;
+
import java.math.BigDecimal;
import java.util.Locale;
-import javax.portlet.ActionRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-currency-service/build.gradle b/modules/apps/commerce/commerce-currency-service/build.gradle
index 32141fe29a473a..036e2f75ece9ad 100644
--- a/modules/apps/commerce/commerce-currency-service/build.gradle
+++ b/modules/apps/commerce/commerce-currency-service/build.gradle
@@ -6,10 +6,10 @@ buildService {
dependencies {
compileOnly group: "com.ibm.icu", name: "icu4j", version: "69.1"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-currency-service/src/main/java/com/liferay/commerce/currency/internal/util/CommercePriceFormatterImpl.java b/modules/apps/commerce/commerce-currency-service/src/main/java/com/liferay/commerce/currency/internal/util/CommercePriceFormatterImpl.java
index 780207262b3296..155b007d3a09fc 100644
--- a/modules/apps/commerce/commerce-currency-service/src/main/java/com/liferay/commerce/currency/internal/util/CommercePriceFormatterImpl.java
+++ b/modules/apps/commerce/commerce-currency-service/src/main/java/com/liferay/commerce/currency/internal/util/CommercePriceFormatterImpl.java
@@ -46,6 +46,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -55,8 +57,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.portlet.ActionRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
diff --git a/modules/apps/commerce/commerce-currency-web/build.gradle b/modules/apps/commerce/commerce-currency-web/build.gradle
index 70d912a4b129d0..7f150015dff915 100644
--- a/modules/apps/commerce/commerce-currency-web/build.gradle
+++ b/modules/apps/commerce/commerce-currency-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/application/list/CommerceCurrencyPanelApp.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/application/list/CommerceCurrencyPanelApp.java
index 32408626173a27..6cb6ff36d36f0a 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/application/list/CommerceCurrencyPanelApp.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/application/list/CommerceCurrencyPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY + ")"
+ target = "(jakarta.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
index b2554c3aab2131..89ee6e368c6f58 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
@@ -28,11 +28,11 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceCurrenciesDisplayContext.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceCurrenciesDisplayContext.java
index b0787d44517458..8bf95c56a1a638 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceCurrenciesDisplayContext.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceCurrenciesDisplayContext.java
@@ -46,19 +46,19 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.LinkedHashMap;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Di Giorgi
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceCurrenciesManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceCurrenciesManagementToolbarDisplayContext.java
index 45d634734f526c..0da1d524d9eb6c 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceCurrenciesManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/CommerceCurrenciesManagementToolbarDisplayContext.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/helper/CommerceCurrencyRequestHelper.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/helper/CommerceCurrencyRequestHelper.java
index 4c297c285b2603..820bdaef4224c4 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/helper/CommerceCurrencyRequestHelper.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/display/context/helper/CommerceCurrencyRequestHelper.java
@@ -8,10 +8,10 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.JavaConstants;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/fragment/renderer/CurrencySelectorFragmentRenderer.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/fragment/renderer/CurrencySelectorFragmentRenderer.java
index 75209330ab6437..207bacada09891 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/fragment/renderer/CurrencySelectorFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/fragment/renderer/CurrencySelectorFragmentRenderer.java
@@ -26,16 +26,16 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/data/set/provider/CurrencyCommerceChannelAccountEntryRelFDSActionProvider.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/data/set/provider/CurrencyCommerceChannelAccountEntryRelFDSActionProvider.java
index 162dbd4abf5370..8bf36dc7e87a58 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/data/set/provider/CurrencyCommerceChannelAccountEntryRelFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/data/set/provider/CurrencyCommerceChannelAccountEntryRelFDSActionProvider.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/data/set/provider/CurrencyCommerceChannelAccountEntryRelFDSDataProvider.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/data/set/provider/CurrencyCommerceChannelAccountEntryRelFDSDataProvider.java
index 6276667e0c6332..a8381812d5abfc 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/data/set/provider/CurrencyCommerceChannelAccountEntryRelFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/data/set/provider/CurrencyCommerceChannelAccountEntryRelFDSDataProvider.java
@@ -24,9 +24,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/taglib/servlet/taglib/CommerceCurrencyCurrenciesScreenNavigationEntry.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/taglib/servlet/taglib/CommerceCurrencyCurrenciesScreenNavigationEntry.java
index a50bf5aee98d50..1c78ae66962a7b 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/taglib/servlet/taglib/CommerceCurrencyCurrenciesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/taglib/servlet/taglib/CommerceCurrencyCurrenciesScreenNavigationEntry.java
@@ -19,14 +19,14 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/taglib/servlet/taglib/CommerceCurrencyExchangeRateScreenNavigationEntry.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/taglib/servlet/taglib/CommerceCurrencyExchangeRateScreenNavigationEntry.java
index cec38b2ddb1ccb..9c15f15d6ef171 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/taglib/servlet/taglib/CommerceCurrencyExchangeRateScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/frontend/taglib/servlet/taglib/CommerceCurrencyExchangeRateScreenNavigationEntry.java
@@ -19,14 +19,14 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/CommerceCurrencyPortlet.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/CommerceCurrencyPortlet.java
index 17d7374589d2e2..389d2609b90a45 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/CommerceCurrencyPortlet.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/CommerceCurrencyPortlet.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,13 +41,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Currencies",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Currencies",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditAccountEntryDefaultCommerceCurrencyMVCActionCommand.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditAccountEntryDefaultCommerceCurrencyMVCActionCommand.java
index e913d53cd5b8e1..8fa00e22a9e4cc 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditAccountEntryDefaultCommerceCurrencyMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditAccountEntryDefaultCommerceCurrencyMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,8 +29,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_currency/edit_account_entry_default_commerce_currency"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditAccountEntryDefaultCommerceCurrencyMVCRenderCommand.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditAccountEntryDefaultCommerceCurrencyMVCRenderCommand.java
index 418ac2da6f5ef2..7e1a44ae50c4d4 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditAccountEntryDefaultCommerceCurrencyMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditAccountEntryDefaultCommerceCurrencyMVCRenderCommand.java
@@ -19,13 +19,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,8 +37,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_currency/edit_account_entry_default_commerce_currency"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditCommerceCurrencyMVCActionCommand.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditCommerceCurrencyMVCActionCommand.java
index ae7391de8c98ad..161a4b430e6b0c 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditCommerceCurrencyMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditCommerceCurrencyMVCActionCommand.java
@@ -28,14 +28,14 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,7 +46,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY,
+ "jakarta.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY,
"mvc.command.name=/commerce_currency/edit_commerce_currency"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditCommerceCurrencyMVCRenderCommand.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditCommerceCurrencyMVCRenderCommand.java
index 79e7e6e8be1312..b41d76630f7e3a 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditCommerceCurrencyMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditCommerceCurrencyMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY,
+ "jakarta.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY,
"mvc.command.name=/commerce_currency/edit_commerce_currency"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditExchangeRateMVCActionCommand.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditExchangeRateMVCActionCommand.java
index 2b5886ec310cfa..5b1e003137bd46 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditExchangeRateMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/portlet/action/EditExchangeRateMVCActionCommand.java
@@ -29,12 +29,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PropertiesParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -43,7 +43,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY,
+ "jakarta.portlet.name=" + CommerceCurrencyPortletKeys.COMMERCE_CURRENCY,
"mvc.command.name=/commerce_currency/edit_exchange_rate"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/servlet/taglib/DefaultCommerceCurrenciesJSPDynamicInclude.java b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/servlet/taglib/DefaultCommerceCurrenciesJSPDynamicInclude.java
index b6c61c6cff6e83..aeca55aa9c33f0 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/servlet/taglib/DefaultCommerceCurrenciesJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-currency-web/src/main/java/com/liferay/commerce/currency/web/internal/servlet/taglib/DefaultCommerceCurrenciesJSPDynamicInclude.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-currency-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-currency-web/src/main/resources/META-INF/resources/init.jsp
index f08ac440dc1f00..09ba11c39dae57 100644
--- a/modules/apps/commerce/commerce-currency-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-currency-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-discount-api/build.gradle b/modules/apps/commerce/commerce-discount-api/build.gradle
index ab1880eaa3c84d..152d761636229c 100644
--- a/modules/apps/commerce/commerce-discount-api/build.gradle
+++ b/modules/apps/commerce/commerce-discount-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-discount-api/src/main/java/com/liferay/commerce/discount/rule/type/CommerceDiscountRuleTypeJSPContributor.java b/modules/apps/commerce/commerce-discount-api/src/main/java/com/liferay/commerce/discount/rule/type/CommerceDiscountRuleTypeJSPContributor.java
index 0de4687bb4115d..093a14e084b4a0 100644
--- a/modules/apps/commerce/commerce-discount-api/src/main/java/com/liferay/commerce/discount/rule/type/CommerceDiscountRuleTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-discount-api/src/main/java/com/liferay/commerce/discount/rule/type/CommerceDiscountRuleTypeJSPContributor.java
@@ -5,8 +5,8 @@
package com.liferay.commerce.discount.rule.type;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-discount-content-web/build.gradle b/modules/apps/commerce/commerce-discount-content-web/build.gradle
index 016ec1b7a87c11..3d84d3748b7144 100644
--- a/modules/apps/commerce/commerce-discount-content-web/build.gradle
+++ b/modules/apps/commerce/commerce-discount-content-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-discount-api")
diff --git a/modules/apps/commerce/commerce-discount-content-web/src/main/java/com/liferay/commerce/discount/content/web/internal/portlet/CommerceDiscountContentPortlet.java b/modules/apps/commerce/commerce-discount-content-web/src/main/java/com/liferay/commerce/discount/content/web/internal/portlet/CommerceDiscountContentPortlet.java
index ee091d1d9c8cca..7694109d68ac84 100644
--- a/modules/apps/commerce/commerce-discount-content-web/src/main/java/com/liferay/commerce/discount/content/web/internal/portlet/CommerceDiscountContentPortlet.java
+++ b/modules/apps/commerce/commerce-discount-content-web/src/main/java/com/liferay/commerce/discount/content/web/internal/portlet/CommerceDiscountContentPortlet.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.discount.constants.CommerceDiscountPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
-import javax.portlet.Portlet;
+import jakarta.portlet.Portlet;
import org.osgi.service.component.annotations.Component;
@@ -26,13 +26,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Coupon Code Entry",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommerceDiscountPortletKeys.COMMERCE_DISCOUNT_CONTENT_WEB,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Coupon Code Entry",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommerceDiscountPortletKeys.COMMERCE_DISCOUNT_CONTENT_WEB,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-discount-content-web/src/main/java/com/liferay/commerce/discount/content/web/internal/portlet/action/ApplyCommerceDiscountCouponCodeMVCActionCommand.java b/modules/apps/commerce/commerce-discount-content-web/src/main/java/com/liferay/commerce/discount/content/web/internal/portlet/action/ApplyCommerceDiscountCouponCodeMVCActionCommand.java
index 9c650e89a2ec30..a1cec7c7c32651 100644
--- a/modules/apps/commerce/commerce-discount-content-web/src/main/java/com/liferay/commerce/discount/content/web/internal/portlet/action/ApplyCommerceDiscountCouponCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-discount-content-web/src/main/java/com/liferay/commerce/discount/content/web/internal/portlet/action/ApplyCommerceDiscountCouponCodeMVCActionCommand.java
@@ -20,10 +20,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceDiscountPortletKeys.COMMERCE_DISCOUNT_CONTENT_WEB,
+ "jakarta.portlet.name=" + CommerceDiscountPortletKeys.COMMERCE_DISCOUNT_CONTENT_WEB,
"mvc.command.name=/commerce_discount_content/apply_commerce_discount_coupon_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-discount-content-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-discount-content-web/src/main/resources/META-INF/resources/init.jsp
index 5665781faa9855..092b6c061ac82d 100644
--- a/modules/apps/commerce/commerce-discount-content-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-discount-content-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-discount-service/build.gradle b/modules/apps/commerce/commerce-discount-service/build.gradle
index 039bc46aab0553..f18ae8d826c0ae 100644
--- a/modules/apps/commerce/commerce-discount-service/build.gradle
+++ b/modules/apps/commerce/commerce-discount-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-discount-service/src/main/java/com/liferay/commerce/discount/internal/search/CommerceDiscountIndexer.java b/modules/apps/commerce/commerce-discount-service/src/main/java/com/liferay/commerce/discount/internal/search/CommerceDiscountIndexer.java
index 2772449c02a680..e3c15c0fb6327c 100644
--- a/modules/apps/commerce/commerce-discount-service/src/main/java/com/liferay/commerce/discount/internal/search/CommerceDiscountIndexer.java
+++ b/modules/apps/commerce/commerce-discount-service/src/main/java/com/liferay/commerce/discount/internal/search/CommerceDiscountIndexer.java
@@ -53,14 +53,14 @@
import com.liferay.portal.search.filter.FilterBuilders;
import com.liferay.portal.search.filter.TermsSetFilterBuilder;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-account/build.gradle b/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-account/build.gradle
index c06840f4bc86b2..d3f34e728771ec 100644
--- a/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-account/build.gradle
+++ b/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-account/build.gradle
@@ -1,6 +1,6 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:fragment:fragment-api")
}
\ No newline at end of file
diff --git a/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-account/src/main/java/com/liferay/commerce/fragment/collection/contributor/account/CommerceAccountFragmentCollectionContributor.java b/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-account/src/main/java/com/liferay/commerce/fragment/collection/contributor/account/CommerceAccountFragmentCollectionContributor.java
index 20df07e2ee7451..b8a0213fcfb107 100644
--- a/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-account/src/main/java/com/liferay/commerce/fragment/collection/contributor/account/CommerceAccountFragmentCollectionContributor.java
+++ b/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-account/src/main/java/com/liferay/commerce/fragment/collection/contributor/account/CommerceAccountFragmentCollectionContributor.java
@@ -8,7 +8,7 @@
import com.liferay.fragment.contributor.BaseFragmentCollectionContributor;
import com.liferay.fragment.contributor.FragmentCollectionContributor;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-cart/build.gradle b/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-cart/build.gradle
index c06840f4bc86b2..d3f34e728771ec 100644
--- a/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-cart/build.gradle
+++ b/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-cart/build.gradle
@@ -1,6 +1,6 @@
dependencies {
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:fragment:fragment-api")
}
\ No newline at end of file
diff --git a/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-cart/src/main/java/com/liferay/commerce/fragment/collection/contributor/cart/CommerceCartFragmentCollectionContributor.java b/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-cart/src/main/java/com/liferay/commerce/fragment/collection/contributor/cart/CommerceCartFragmentCollectionContributor.java
index fd118312a8c9ed..8a4071e71b0e43 100644
--- a/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-cart/src/main/java/com/liferay/commerce/fragment/collection/contributor/cart/CommerceCartFragmentCollectionContributor.java
+++ b/modules/apps/commerce/commerce-fragment/commerce-fragment-collection-contributor/commerce-fragment-collection-contributor-cart/src/main/java/com/liferay/commerce/fragment/collection/contributor/cart/CommerceCartFragmentCollectionContributor.java
@@ -8,7 +8,7 @@
import com.liferay.fragment.contributor.BaseFragmentCollectionContributor;
import com.liferay.fragment.contributor.FragmentCollectionContributor;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-api/build.gradle b/modules/apps/commerce/commerce-frontend-api/build.gradle
index 8fcc83a3bef3cd..96b3aaa2a72717 100644
--- a/modules/apps/commerce/commerce-frontend-api/build.gradle
+++ b/modules/apps/commerce/commerce-frontend-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-frontend-api/src/main/java/com/liferay/commerce/frontend/helper/HeaderHelper.java b/modules/apps/commerce/commerce-frontend-api/src/main/java/com/liferay/commerce/frontend/helper/HeaderHelper.java
index e3d25a43c8a395..2f35a745381cf0 100644
--- a/modules/apps/commerce/commerce-frontend-api/src/main/java/com/liferay/commerce/frontend/helper/HeaderHelper.java
+++ b/modules/apps/commerce/commerce-frontend-api/src/main/java/com/liferay/commerce/frontend/helper/HeaderHelper.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.workflow.WorkflowTask;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import java.util.List;
/**
* @author Alec Sloan
diff --git a/modules/apps/commerce/commerce-frontend-api/src/main/java/com/liferay/commerce/frontend/helper/HeaderHelperUtil.java b/modules/apps/commerce/commerce-frontend-api/src/main/java/com/liferay/commerce/frontend/helper/HeaderHelperUtil.java
index 13fc68835af1d7..fa65dd6809a276 100644
--- a/modules/apps/commerce/commerce-frontend-api/src/main/java/com/liferay/commerce/frontend/helper/HeaderHelperUtil.java
+++ b/modules/apps/commerce/commerce-frontend-api/src/main/java/com/liferay/commerce/frontend/helper/HeaderHelperUtil.java
@@ -10,9 +10,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.workflow.WorkflowTask;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import java.util.List;
import org.osgi.framework.FrameworkUtil;
import org.osgi.util.tracker.ServiceTracker;
diff --git a/modules/apps/commerce/commerce-frontend-impl/build.gradle b/modules/apps/commerce/commerce-frontend-impl/build.gradle
index 567190ae7c2f79..0f60f69d029944 100644
--- a/modules/apps/commerce/commerce-frontend-impl/build.gradle
+++ b/modules/apps/commerce/commerce-frontend-impl/build.gradle
@@ -2,14 +2,14 @@ dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.apache.cxf.core", version: "3.5.10.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.apache.cxf.rt.frontend.jaxrs", version: "3.5.10.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.apache.cxf.rt.rs.extension.providers", version: "3.5.10.JAKARTA_LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.cxf", name: "cxf-core", version: "3.5.10"
- compileOnly group: "org.apache.cxf", name: "cxf-rt-frontend-jaxrs", version: "3.5.10"
- compileOnly group: "org.apache.cxf", name: "cxf-rt-rs-extension-providers", version: "3.5.10"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.jaxrs", version: "1.0.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/account/CommerceAccountResource.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/account/CommerceAccountResource.java
index 8532fbbb6c099d..9cb28e90cf2be0 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/account/CommerceAccountResource.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/account/CommerceAccountResource.java
@@ -52,28 +52,28 @@
import com.liferay.portal.kernel.webserver.WebServerServletToken;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import javax.ws.rs.FormParam;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/address/AddressResource.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/address/AddressResource.java
index b6418b703f3567..8a19d4b1f56291 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/address/AddressResource.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/address/AddressResource.java
@@ -25,18 +25,18 @@
import com.liferay.portal.kernel.service.RegionService;
import com.liferay.portal.kernel.theme.ThemeDisplay;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
import java.util.ArrayList;
import java.util.List;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/CommerceFrontEndApplication.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/CommerceFrontEndApplication.java
index 5ea337128fb181..c42d5758ac614d 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/CommerceFrontEndApplication.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/CommerceFrontEndApplication.java
@@ -13,11 +13,11 @@
import com.liferay.commerce.frontend.internal.wishlist.CommerceWishListResource;
import com.liferay.portal.kernel.theme.ThemeDisplay;
+import jakarta.ws.rs.core.Application;
+
import java.util.HashSet;
import java.util.Set;
-import javax.ws.rs.core.Application;
-
import org.apache.cxf.jaxrs.ext.ContextProvider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/context/provider/ThemeDisplayContextProvider.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/context/provider/ThemeDisplayContextProvider.java
index 05aaa67bf1b7bb..5f1e02c5068df0 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/context/provider/ThemeDisplayContextProvider.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/context/provider/ThemeDisplayContextProvider.java
@@ -8,9 +8,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.Provider;
import org.apache.cxf.jaxrs.ext.ContextProvider;
import org.apache.cxf.message.Message;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/filter/LiferayEventProcessorFilter.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/filter/LiferayEventProcessorFilter.java
index 67f3623e1954d7..4ebec03bb5736b 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/filter/LiferayEventProcessorFilter.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/application/filter/LiferayEventProcessorFilter.java
@@ -12,15 +12,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.util.PropsValues;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
-import javax.ws.rs.container.ContainerRequestContext;
-import javax.ws.rs.container.ContainerRequestFilter;
-import javax.ws.rs.container.PreMatching;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.container.PreMatching;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/cart/CommerceCartResource.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/cart/CommerceCartResource.java
index fc915eeab1a7a9..3ec2d0a31adebb 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/cart/CommerceCartResource.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/cart/CommerceCartResource.java
@@ -56,6 +56,17 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -64,17 +75,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/helper/HeaderHelperImpl.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/helper/HeaderHelperImpl.java
index 54a98d670da9f4..7f7826ed966192 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/helper/HeaderHelperImpl.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/helper/HeaderHelperImpl.java
@@ -15,11 +15,11 @@
import com.liferay.portal.kernel.workflow.WorkflowTask;
import com.liferay.portal.kernel.workflow.WorkflowTaskManager;
+import jakarta.portlet.PortletURL;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletURL;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/order/CommerceOrderResource.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/order/CommerceOrderResource.java
index a449ef2093d9f2..fa1dcebf460cc5 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/order/CommerceOrderResource.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/order/CommerceOrderResource.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.util.Date;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/search/CommerceSearchResource.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/search/CommerceSearchResource.java
index 3accdc28538f03..120949a7ff562b 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/search/CommerceSearchResource.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/search/CommerceSearchResource.java
@@ -59,6 +59,19 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -66,19 +79,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/wishlist/CommerceWishListResource.java b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/wishlist/CommerceWishListResource.java
index 5d3f7f85c380e3..5cbdcf1ff5846a 100644
--- a/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/wishlist/CommerceWishListResource.java
+++ b/modules/apps/commerce/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/wishlist/CommerceWishListResource.java
@@ -32,15 +32,15 @@
import com.liferay.portal.kernel.service.ServiceContextFactory;
import com.liferay.portal.kernel.util.Portal;
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-js/build.gradle b/modules/apps/commerce/commerce-frontend-js/build.gradle
index faf1a5ad14dc5b..fc44f7e19e23a9 100644
--- a/modules/apps/commerce/commerce-frontend-js/build.gradle
+++ b/modules/apps/commerce/commerce-frontend-js/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-frontend-js/src/main/java/com/liferay/commerce/frontend/js/internal/servlet/taglib/CommerceFrontendJsDynamicInclude.java b/modules/apps/commerce/commerce-frontend-js/src/main/java/com/liferay/commerce/frontend/js/internal/servlet/taglib/CommerceFrontendJsDynamicInclude.java
index fc1a53cf9705d7..abe875909ff52f 100644
--- a/modules/apps/commerce/commerce-frontend-js/src/main/java/com/liferay/commerce/frontend/js/internal/servlet/taglib/CommerceFrontendJsDynamicInclude.java
+++ b/modules/apps/commerce/commerce-frontend-js/src/main/java/com/liferay/commerce/frontend/js/internal/servlet/taglib/CommerceFrontendJsDynamicInclude.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.settings.GroupServiceSettingsLocator;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-frontend-taglib/build.gradle b/modules/apps/commerce/commerce-frontend-taglib/build.gradle
index 8aeddacaf896ec..aed2bfdf77c4ac 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/build.gradle
+++ b/modules/apps/commerce/commerce-frontend-taglib/build.gradle
@@ -1,10 +1,10 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/internal/servlet/ServletContextUtil.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/internal/servlet/ServletContextUtil.java
index 200709083333b3..4439067eace07f 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/internal/servlet/ServletContextUtil.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/internal/servlet/ServletContextUtil.java
@@ -25,7 +25,7 @@
import com.liferay.portal.kernel.module.service.Snapshot;
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AccountSelectorTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AccountSelectorTag.java
index 6e150ec7caac80..62f8ad691267d5 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AccountSelectorTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AccountSelectorTag.java
@@ -53,15 +53,15 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.taglib.util.IncludeTag;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AddToCartTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AddToCartTag.java
index 3fbc8e5ab6a44f..0ce16292e17756 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AddToCartTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AddToCartTag.java
@@ -51,15 +51,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import java.math.BigDecimal;
+import jakarta.portlet.PortletRequest;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.portlet.PortletRequest;
+import java.math.BigDecimal;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AddToWishListTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AddToWishListTag.java
index f63a27e23df898..c1541d5d9f89af 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AddToWishListTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AddToWishListTag.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Gianmarco Brunialti Masera
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AvailabilityLabelTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AvailabilityLabelTag.java
index 9e577248ff63f9..b2289bda617e13 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AvailabilityLabelTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/AvailabilityLabelTag.java
@@ -17,9 +17,9 @@
import com.liferay.taglib.servlet.PipingServletResponseFactory;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Gianmarco Brunialti Masera
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/CompareCheckboxTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/CompareCheckboxTag.java
index 5edee78d485d53..435be2c0b39a18 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/CompareCheckboxTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/CompareCheckboxTag.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.taglib.util.IncludeTag;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/CouponCodeTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/CouponCodeTag.java
index 81b7ed4536ce0b..4bd57ca5006dcb 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/CouponCodeTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/CouponCodeTag.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/DiscontinuedLabelTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/DiscontinuedLabelTag.java
index 20eab5274b6f77..c0befea9a5b3f1 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/DiscontinuedLabelTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/DiscontinuedLabelTag.java
@@ -13,11 +13,11 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.taglib.util.IncludeTag;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/GalleryTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/GalleryTag.java
index 85c4d302e2edd0..aa3906fbf52b19 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/GalleryTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/GalleryTag.java
@@ -16,9 +16,9 @@
import com.liferay.taglib.servlet.PipingServletResponseFactory;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Fabio Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/HeaderTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/HeaderTag.java
index ba02d35374ca97..211c5e785f9d9e 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/HeaderTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/HeaderTag.java
@@ -13,12 +13,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/InfoBoxTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/InfoBoxTag.java
index 1012c76d531a70..e39231e01d3ce4 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/InfoBoxTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/InfoBoxTag.java
@@ -8,11 +8,11 @@
import com.liferay.commerce.frontend.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.util.Map;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/MiniCartTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/MiniCartTag.java
index ce8041068cd1bc..3699c66c5bba5e 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/MiniCartTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/MiniCartTag.java
@@ -38,18 +38,18 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+
import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
/**
* @author Gianmarco Brunialti Masera
*/
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ModalContentTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ModalContentTag.java
index c1ff26fa6094a3..f37be918fb57d3 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ModalContentTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ModalContentTag.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.frontend.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ModalTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ModalTag.java
index 21fd4d0fdf2b10..9212090514437f 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ModalTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ModalTag.java
@@ -12,8 +12,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/OptionSelectorTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/OptionSelectorTag.java
index 0b365389387940..bdbd28441e9482 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/OptionSelectorTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/OptionSelectorTag.java
@@ -16,9 +16,9 @@
import com.liferay.taglib.servlet.PipingServletResponseFactory;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/OrderSubscriptionInfoTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/OrderSubscriptionInfoTag.java
index 6be894dfb02bb5..ab435de16dd875 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/OrderSubscriptionInfoTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/OrderSubscriptionInfoTag.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/PanelTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/PanelTag.java
index 9adaedb9495dc3..3780ab13c5c9a6 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/PanelTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/PanelTag.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/PriceTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/PriceTag.java
index da7a6af6583991..8001f5b4443336 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/PriceTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/PriceTag.java
@@ -36,15 +36,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+
import java.math.BigDecimal;
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ProductSubscriptionInfoTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ProductSubscriptionInfoTag.java
index 68814bf40eca0a..9f46a8f434b1f8 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ProductSubscriptionInfoTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/ProductSubscriptionInfoTag.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/RequestQuoteTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/RequestQuoteTag.java
index 98d1ed866046ce..ec2a78413aef67 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/RequestQuoteTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/RequestQuoteTag.java
@@ -42,12 +42,12 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.taglib.util.IncludeTag;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Stefano Motta
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/SearchBarTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/SearchBarTag.java
index 5acc5d564b4d47..eb28c0b6a703b7 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/SearchBarTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/SearchBarTag.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.frontend.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/SearchResultsTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/SearchResultsTag.java
index c68c65bdd1e513..ed81d20e46f707 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/SearchResultsTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/SearchResultsTag.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/StepTrackerTag.java b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/StepTrackerTag.java
index f9fdbaeb81a4d4..7079679901b5e3 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/StepTrackerTag.java
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/java/com/liferay/commerce/frontend/taglib/servlet/taglib/StepTrackerTag.java
@@ -12,10 +12,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* @author Fabio Diego Mastrorilli
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/liferay-commerce-ui.tld b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/liferay-commerce-ui.tld
index 88b856963d9cc8..0fa19997ef04df 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/liferay-commerce-ui.tld
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/liferay-commerce-ui.tld
@@ -254,7 +254,7 @@
transitionPortletURL
false
true
- javax.portlet.PortletURL
+ jakarta.portlet.PortletURL
version
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/account_selector/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/account_selector/init.jsp
index 8c1eed2f56413f..1ead673905b855 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/account_selector/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/account_selector/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/coupon_code/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/coupon_code/init.jsp
index 3ac99b5c22c838..efb316cd61d1a1 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/coupon_code/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/coupon_code/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/header/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/header/init.jsp
index 1d2221dee5085c..5792585473e9fb 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/header/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/header/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -34,9 +34,9 @@ page import="com.liferay.portal.kernel.util.PortletKeys" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.workflow.WorkflowTask" %>
-<%@ page import="java.util.List" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
-<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="java.util.List" %>
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/info_box/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/info_box/init.jsp
index e144d21abb5393..4a6ac760f3062d 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/info_box/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/info_box/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/mini_cart/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/mini_cart/init.jsp
index 14bd50b1fc0e52..28c15f068bc1b6 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/mini_cart/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/mini_cart/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/modal_content/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/modal_content/init.jsp
index bcc0cbff9663de..4ed21c0ed5fee5 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/modal_content/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/modal_content/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/panel/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/panel/init.jsp
index 23f2d9b28003f0..57529b62c6fb58 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/panel/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/panel/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
taglib uri="http://liferay.com/tld/clay" prefix="clay" %><%@
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/price/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/price/init.jsp
index 5de15fb3ff1baf..f2a13c3d1ef577 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/price/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/price/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/request_quote/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/request_quote/init.jsp
index 1aac6d8ba5bb5f..d0fbfb542a39ad 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/request_quote/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/request_quote/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
diff --git a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/subscription_info/init.jsp b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/subscription_info/init.jsp
index e92e655debfa86..a8461e3e465b52 100644
--- a/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/subscription_info/init.jsp
+++ b/modules/apps/commerce/commerce-frontend-taglib/src/main/resources/META-INF/resources/subscription_info/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %><%@
taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
diff --git a/modules/apps/commerce/commerce-geocoder-bing/build.gradle b/modules/apps/commerce/commerce-geocoder-bing/build.gradle
index d593653a343390..963b2ae8233a8d 100644
--- a/modules/apps/commerce/commerce-geocoder-bing/build.gradle
+++ b/modules/apps/commerce/commerce-geocoder-bing/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:static:portal-configuration:portal-configuration-metatype-api")
diff --git a/modules/apps/commerce/commerce-geocoder-bing/src/main/java/com/liferay/commerce/geocoder/bing/internal/BingCommerceGeocoder.java b/modules/apps/commerce/commerce-geocoder-bing/src/main/java/com/liferay/commerce/geocoder/bing/internal/BingCommerceGeocoder.java
index 28c45ab6088a30..5f7bbabb8d5bc5 100644
--- a/modules/apps/commerce/commerce-geocoder-bing/src/main/java/com/liferay/commerce/geocoder/bing/internal/BingCommerceGeocoder.java
+++ b/modules/apps/commerce/commerce-geocoder-bing/src/main/java/com/liferay/commerce/geocoder/bing/internal/BingCommerceGeocoder.java
@@ -26,9 +26,9 @@
import com.liferay.portal.kernel.util.URLCodec;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-health-status-web/build.gradle b/modules/apps/commerce/commerce-health-status-web/build.gradle
index b0e82045bbf88f..7ab64bbdb95cfe 100644
--- a/modules/apps/commerce/commerce-health-status-web/build.gradle
+++ b/modules/apps/commerce/commerce-health-status-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/AccountsCommerceHealthStatus.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/AccountsCommerceHealthStatus.java
index 2924b31b9bfa30..6ef7270bee3be9 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/AccountsCommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/AccountsCommerceHealthStatus.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.transaction.TransactionInvokerUtil;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/CurrenciesCommerceHealthStatus.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/CurrenciesCommerceHealthStatus.java
index 6684a215d8f1d6..d67fda264cc5ed 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/CurrenciesCommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/CurrenciesCommerceHealthStatus.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.service.ServiceContextFactory;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/MeasurementUnitsCommerceHealthStatus.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/MeasurementUnitsCommerceHealthStatus.java
index 12d16205e5fb76..cfb00bc9b48801 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/MeasurementUnitsCommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/MeasurementUnitsCommerceHealthStatus.java
@@ -15,12 +15,12 @@
import com.liferay.portal.kernel.service.ServiceContextFactory;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/PricingCommerceHealthStatus.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/PricingCommerceHealthStatus.java
index d1c0f4df89dd05..8aba34a8990adf 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/PricingCommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/PricingCommerceHealthStatus.java
@@ -38,6 +38,8 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
@@ -46,8 +48,6 @@
import java.util.ResourceBundle;
import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/ServiceAccessPolicyCommerceHealthStatus.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/ServiceAccessPolicyCommerceHealthStatus.java
index d69f86d1b7659f..7a4b4296a9e1a0 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/ServiceAccessPolicyCommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/ServiceAccessPolicyCommerceHealthStatus.java
@@ -19,13 +19,13 @@
import com.liferay.portal.security.service.access.policy.model.SAPEntry;
import com.liferay.portal.security.service.access.policy.service.SAPEntryLocalService;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/SplitOrderByCatalogHealthStatus.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/SplitOrderByCatalogHealthStatus.java
index 362afe8064d2db..daa363a81ba6f3 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/SplitOrderByCatalogHealthStatus.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/SplitOrderByCatalogHealthStatus.java
@@ -27,14 +27,14 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.ResourceBundle;
import java.util.concurrent.Callable;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/application/list/CommerceHealthCheckPanelApp.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/application/list/CommerceHealthCheckPanelApp.java
index 6e98cdf03b5a30..381288b9865995 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/application/list/CommerceHealthCheckPanelApp.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/application/list/CommerceHealthCheckPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommercePortletKeys.COMMERCE_HEALTH_CHECK + ")"
+ target = "(jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_HEALTH_CHECK + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/display/context/CommerceHealthStatusDisplayContext.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/display/context/CommerceHealthStatusDisplayContext.java
index 58bdbe8c61f67f..1c5ad0fc566125 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/display/context/CommerceHealthStatusDisplayContext.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/display/context/CommerceHealthStatusDisplayContext.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/portlet/CommerceHealthCheckPortlet.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/portlet/CommerceHealthCheckPortlet.java
index c66989b9446171..a653f3de30b49f 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/portlet/CommerceHealthCheckPortlet.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/portlet/CommerceHealthCheckPortlet.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,13 +39,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Health Check",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_HEALTH_CHECK,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Health Check",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_HEALTH_CHECK,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/portlet/action/FixCommerceHealthStatusIssueMVCActionCommand.java b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/portlet/action/FixCommerceHealthStatusIssueMVCActionCommand.java
index 2bdd862f308af0..90495fe021a15e 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/portlet/action/FixCommerceHealthStatusIssueMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/java/com/liferay/commerce/health/status/web/internal/portlet/action/FixCommerceHealthStatusIssueMVCActionCommand.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_HEALTH_CHECK,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_HEALTH_CHECK,
"mvc.command.name=/commerce_health_check/fix_commerce_health_status_issue"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-health-status-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-health-status-web/src/main/resources/META-INF/resources/init.jsp
index 29f4c00e1f9e4a..f46a77a1db2629 100644
--- a/modules/apps/commerce/commerce-health-status-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-health-status-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-initializer-util/build.gradle b/modules/apps/commerce/commerce-initializer-util/build.gradle
index 38c23cebbdeb53..4389e92ccaea00 100644
--- a/modules/apps/commerce/commerce-initializer-util/build.gradle
+++ b/modules/apps/commerce/commerce-initializer-util/build.gradle
@@ -2,9 +2,9 @@ dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
compileOnly group: "com.google.code.findbugs", name: "annotations", version: "3.0.1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:blogs:blogs-api")
diff --git a/modules/apps/commerce/commerce-initializer-util/src/main/java/com/liferay/commerce/initializer/util/PortletSettingsImporter.java b/modules/apps/commerce/commerce-initializer-util/src/main/java/com/liferay/commerce/initializer/util/PortletSettingsImporter.java
index cc6f1577104158..df3a353831935a 100644
--- a/modules/apps/commerce/commerce-initializer-util/src/main/java/com/liferay/commerce/initializer/util/PortletSettingsImporter.java
+++ b/modules/apps/commerce/commerce-initializer-util/src/main/java/com/liferay/commerce/initializer/util/PortletSettingsImporter.java
@@ -38,14 +38,14 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portlet.display.template.PortletDisplayTemplate;
+import jakarta.portlet.PortletPreferences;
+
import java.io.File;
import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-service/build.gradle b/modules/apps/commerce/commerce-inventory-service/build.gradle
index e8c5b18000c563..78e24ac12118cb 100644
--- a/modules/apps/commerce/commerce-inventory-service/build.gradle
+++ b/modules/apps/commerce/commerce-inventory-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-inventory-service/src/main/java/com/liferay/commerce/inventory/internal/search/CommerceInventoryWarehouseIndexer.java b/modules/apps/commerce/commerce-inventory-service/src/main/java/com/liferay/commerce/inventory/internal/search/CommerceInventoryWarehouseIndexer.java
index 55e5996b0162e3..3bc5a5701c7989 100644
--- a/modules/apps/commerce/commerce-inventory-service/src/main/java/com/liferay/commerce/inventory/internal/search/CommerceInventoryWarehouseIndexer.java
+++ b/modules/apps/commerce/commerce-inventory-service/src/main/java/com/liferay/commerce/inventory/internal/search/CommerceInventoryWarehouseIndexer.java
@@ -26,13 +26,13 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.GetterUtil;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.math.BigDecimal;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/build.gradle b/modules/apps/commerce/commerce-inventory-web/build.gradle
index 66a217d1335df6..acf87bbcb87deb 100644
--- a/modules/apps/commerce/commerce-inventory-web/build.gradle
+++ b/modules/apps/commerce/commerce-inventory-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/application/list/CommerceInventoryPanelApp.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/application/list/CommerceInventoryPanelApp.java
index 6df1b7570edf1a..a3062093512336 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/application/list/CommerceInventoryPanelApp.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/application/list/CommerceInventoryPanelApp.java
@@ -38,7 +38,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/display/context/CommerceInventoryDisplayContext.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/display/context/CommerceInventoryDisplayContext.java
index 97f0cb2ef893d7..8b363bfe5192c1 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/display/context/CommerceInventoryDisplayContext.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/display/context/CommerceInventoryDisplayContext.java
@@ -31,17 +31,17 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.RenderURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-import javax.portlet.RenderURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Luca Pellizzon
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryAuditFDSDataProvider.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryAuditFDSDataProvider.java
index 1cf2afecdb01f6..35bd893f91b665 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryAuditFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryAuditFDSDataProvider.java
@@ -23,6 +23,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -31,8 +33,6 @@
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryBookedFDSDataProvider.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryBookedFDSDataProvider.java
index 69f0c983a26b31..97d788d058a46a 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryBookedFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryBookedFDSDataProvider.java
@@ -26,6 +26,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -34,8 +36,6 @@
import java.util.Date;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryItemFDSActionProvider.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryItemFDSActionProvider.java
index 716bc503af60a6..e6739a0642ea39 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryItemFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryItemFDSActionProvider.java
@@ -27,11 +27,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryItemFDSDataProvider.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryItemFDSDataProvider.java
index 8b1b7fc5c3eeb2..8d31dff1b736cd 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryItemFDSDataProvider.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryReplenishmentFDSActionProvider.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryReplenishmentFDSActionProvider.java
index 5f71cca928a003..204c89ec16608f 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryReplenishmentFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryReplenishmentFDSActionProvider.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryReplenishmentFDSDataProvider.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryReplenishmentFDSDataProvider.java
index e74c775257f4e4..3467fa7f4dd502 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryReplenishmentFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryReplenishmentFDSDataProvider.java
@@ -22,6 +22,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -29,8 +31,6 @@
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseFDSActionProvider.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseFDSActionProvider.java
index 3ba4523e434d40..83993c90ab4b44 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseFDSActionProvider.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseFDSDataProvider.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseFDSDataProvider.java
index 93c8cea22bf782..54eccb3b694100 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseFDSDataProvider.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryBookedScreenNavigationEntry.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryBookedScreenNavigationEntry.java
index 668971f36121ec..2fa159f1ca0d19 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryBookedScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryBookedScreenNavigationEntry.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryChangeLogScreenNavigationEntry.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryChangeLogScreenNavigationEntry.java
index 86a281df69cff9..f08b88d2fbfe7a 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryChangeLogScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryChangeLogScreenNavigationEntry.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryReplenishmentItemsScreenNavigationEntry.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryReplenishmentItemsScreenNavigationEntry.java
index 057a25af3e7cc0..6f17319b1b9d52 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryReplenishmentItemsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryReplenishmentItemsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehousesScreenNavigationEntry.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehousesScreenNavigationEntry.java
index 0a7d10107eb098..51e9113ed6614b 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehousesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehousesScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/CommerceInventoryPortlet.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/CommerceInventoryPortlet.java
index 09d8a0ab25876e..a52061bbbd743c 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/CommerceInventoryPortlet.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/CommerceInventoryPortlet.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -43,13 +43,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Inventory",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Inventory",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/AddCommerceInventoryItemMVCRenderCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/AddCommerceInventoryItemMVCRenderCommand.java
index c9e8d11ea893c2..68dcff8cc42cd2 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/AddCommerceInventoryItemMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/AddCommerceInventoryItemMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/add_commerce_inventory_item"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryItemMVCRenderCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryItemMVCRenderCommand.java
index a959353d803318..655d1786dc0f73 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryItemMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryItemMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/edit_commerce_inventory_item"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryReplenishmentItemMVCActionCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryReplenishmentItemMVCActionCommand.java
index 60f7c4b32aa67b..74340888be6cdf 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryReplenishmentItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryReplenishmentItemMVCActionCommand.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Calendar;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Calendar;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/edit_commerce_inventory_replenishment_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryReplenishmentItemMVCRenderCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryReplenishmentItemMVCRenderCommand.java
index 9fcb6673ed8007..1df1e3fcc7b1fe 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryReplenishmentItemMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryReplenishmentItemMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -20,7 +20,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/edit_commerce_inventory_replenishment_item"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCActionCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCActionCommand.java
index c6e31d864cecc4..359299e0253ee3 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCActionCommand.java
@@ -20,8 +20,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/edit_commerce_inventory_warehouse_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCRenderCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCRenderCommand.java
index 2413f551267a3d..ccb15fc5b3be2d 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/edit_commerce_inventory_warehouse_item"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCActionCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCActionCommand.java
index adab8baffd6852..c14b315cc45625 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCActionCommand.java
@@ -27,10 +27,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.math.BigDecimal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.math.BigDecimal;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/edit_commerce_inventory_warehouse"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCRenderCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCRenderCommand.java
index 64ef38b117e219..8575147853cc84 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/edit_commerce_inventory_warehouse"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/TransferQuantitiesMVCActionCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/TransferQuantitiesMVCActionCommand.java
index cac10a9d1d2d40..a1fe9881e5d03e 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/TransferQuantitiesMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/TransferQuantitiesMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/transfer_quantities"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/TransferQuantitiesMVCRenderCommand.java b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/TransferQuantitiesMVCRenderCommand.java
index ad3b318c7f0e95..8f4d997c1d7763 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/TransferQuantitiesMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/java/com/liferay/commerce/inventory/web/internal/portlet/action/TransferQuantitiesMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -20,7 +20,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY,
"mvc.command.name=/commerce_inventory/transfer_quantities"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-inventory-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-inventory-web/src/main/resources/META-INF/resources/init.jsp
index cc73c9243ad9b1..5f675eb965fe2a 100644
--- a/modules/apps/commerce/commerce-inventory-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-inventory-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-item-selector-web/build.gradle b/modules/apps/commerce/commerce-item-selector-web/build.gradle
index 84111536ec35e7..4ec216fb9edaab 100644
--- a/modules/apps/commerce/commerce-item-selector-web/build.gradle
+++ b/modules/apps/commerce/commerce-item-selector-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/CommercePriceListItemSelectorView.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/CommercePriceListItemSelectorView.java
index 71ed2a37dce3fa..a5a43839322621 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/CommercePriceListItemSelectorView.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/CommercePriceListItemSelectorView.java
@@ -16,6 +16,15 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
@@ -23,15 +32,6 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/SimpleSiteItemSelectorView.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/SimpleSiteItemSelectorView.java
index d81f81005d572b..5890306b5f787a 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/SimpleSiteItemSelectorView.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/SimpleSiteItemSelectorView.java
@@ -15,21 +15,21 @@
import com.liferay.portal.kernel.service.GroupService;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/BaseCommerceItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/BaseCommerceItemSelectorViewDisplayContext.java
index bfe21b8ff139f9..a31c14e65fad84 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/BaseCommerceItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/BaseCommerceItemSelectorViewDisplayContext.java
@@ -10,9 +10,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/CommercePriceListItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/CommercePriceListItemSelectorViewDisplayContext.java
index af2bda75b5a45a..980572cb05417f 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/CommercePriceListItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/CommercePriceListItemSelectorViewDisplayContext.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/CommercePriceListItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/CommercePriceListItemSelectorViewManagementToolbarDisplayContext.java
index 0d606493ebd3b3..0c8166faff5df4 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/CommercePriceListItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/CommercePriceListItemSelectorViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/SimpleSiteItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/SimpleSiteItemSelectorViewDisplayContext.java
index 57f87e90fdf836..3910bde063e495 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/SimpleSiteItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/SimpleSiteItemSelectorViewDisplayContext.java
@@ -21,14 +21,14 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.comparator.GroupNameComparator;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Locale;
import java.util.Objects;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alec Sloan
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/SimpleSiteItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/SimpleSiteItemSelectorViewManagementToolbarDisplayContext.java
index 9ed087983aeead..8f9fb3d5d30d69 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/SimpleSiteItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/display/context/SimpleSiteItemSelectorViewManagementToolbarDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletRequest;
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceCountryItemSelectorChecker.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceCountryItemSelectorChecker.java
index bf9422ddeda5de..fc5484bf268e24 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceCountryItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceCountryItemSelectorChecker.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.model.Country;
import com.liferay.portal.kernel.util.SetUtil;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceInventoryWarehouseChecker.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceInventoryWarehouseChecker.java
index 8bc24640f03b7c..0a59c427899c6a 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceInventoryWarehouseChecker.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceInventoryWarehouseChecker.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.SetUtil;
-import java.util.Set;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletResponse;
+import java.util.Set;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommercePriceListItemSelectorChecker.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommercePriceListItemSelectorChecker.java
index 906f510f6cfc19..1e4bf4d43ca643 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommercePriceListItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommercePriceListItemSelectorChecker.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.SetUtil;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommercePricingClassItemSelectorChecker.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommercePricingClassItemSelectorChecker.java
index fc55269da9fa83..320332545a3972 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommercePricingClassItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommercePricingClassItemSelectorChecker.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.SetUtil;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceProductInstanceItemSelectorChecker.java b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceProductInstanceItemSelectorChecker.java
index 6b3d445e57cb41..e765bf3db3c7b6 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceProductInstanceItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/java/com/liferay/commerce/item/selector/web/internal/search/CommerceProductInstanceItemSelectorChecker.java
@@ -12,7 +12,7 @@
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderResponse;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-item-selector-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-item-selector-web/src/main/resources/META-INF/resources/init.jsp
index 1bd5d43ca2ccba..7a0bd383b46cca 100644
--- a/modules/apps/commerce/commerce-item-selector-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-item-selector-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-media-api/build.gradle b/modules/apps/commerce/commerce-media-api/build.gradle
index d843dacb8e7812..d7232a15391883 100644
--- a/modules/apps/commerce/commerce-media-api/build.gradle
+++ b/modules/apps/commerce/commerce-media-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:static:osgi:osgi-util")
}
\ No newline at end of file
diff --git a/modules/apps/commerce/commerce-media-impl/build.gradle b/modules/apps/commerce/commerce-media-impl/build.gradle
index 0b058bfa48aaa2..fd54551922f99b 100644
--- a/modules/apps/commerce/commerce-media-impl/build.gradle
+++ b/modules/apps/commerce/commerce-media-impl/build.gradle
@@ -1,10 +1,10 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/DefaultCommerceMediaResolver.java b/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/DefaultCommerceMediaResolver.java
index 5f9dec4aad7fa2..5c160eec9f3417 100644
--- a/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/DefaultCommerceMediaResolver.java
+++ b/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/DefaultCommerceMediaResolver.java
@@ -34,7 +34,7 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.asset.service.permission.AssetCategoryPermission;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/servlet/CommerceMediaServlet.java b/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/servlet/CommerceMediaServlet.java
index 5571923f86e867..1f933a1bab5fda 100644
--- a/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/servlet/CommerceMediaServlet.java
+++ b/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/servlet/CommerceMediaServlet.java
@@ -59,15 +59,15 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portlet.asset.service.permission.AssetCategoryPermission;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/servlet/filter/CommerceMediaAuthVerifierFilter.java b/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/servlet/filter/CommerceMediaAuthVerifierFilter.java
index 06909421346022..4b0a3fa99a6ffc 100644
--- a/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/servlet/filter/CommerceMediaAuthVerifierFilter.java
+++ b/modules/apps/commerce/commerce-media-impl/src/main/java/com/liferay/commerce/media/internal/servlet/filter/CommerceMediaAuthVerifierFilter.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.media.constants.CommerceMediaConstants;
import com.liferay.portal.servlet.filters.authverifier.AuthVerifierFilter;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-media-test/build.gradle b/modules/apps/commerce/commerce-media-test/build.gradle
index e05b0280dfac90..6ae74ca06b2b6b 100644
--- a/modules/apps/commerce/commerce-media-test/build.gradle
+++ b/modules/apps/commerce/commerce-media-test/build.gradle
@@ -1,6 +1,6 @@
dependencies {
testIntegrationImplementation group: "com.github.ignaciotcrespo", name: "frutilla", version: "0.7.1"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation project(":apps:account:account-api")
testIntegrationImplementation project(":apps:commerce:commerce-account-test-util")
testIntegrationImplementation project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-notification-api/build.gradle b/modules/apps/commerce/commerce-notification-api/build.gradle
index e6a57efa768774..6f844946c3d3ad 100644
--- a/modules/apps/commerce/commerce-notification-api/build.gradle
+++ b/modules/apps/commerce/commerce-notification-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-notification-service/build.gradle b/modules/apps/commerce/commerce-notification-service/build.gradle
index 569c1382bb35f7..f7cca73a1f88f9 100644
--- a/modules/apps/commerce/commerce-notification-service/build.gradle
+++ b/modules/apps/commerce/commerce-notification-service/build.gradle
@@ -5,11 +5,11 @@ buildService {
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "com.sun.mail", name: "jakarta.mail", version: "1.6.6"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.mail", name: "jakarta.mail-api", version: "2.1.3"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-notification-service/src/main/java/com/liferay/commerce/notification/service/impl/CommerceNotificationQueueEntryLocalServiceImpl.java b/modules/apps/commerce/commerce-notification-service/src/main/java/com/liferay/commerce/notification/service/impl/CommerceNotificationQueueEntryLocalServiceImpl.java
index 44106eaf3f1fb5..8c3c57f2282359 100644
--- a/modules/apps/commerce/commerce-notification-service/src/main/java/com/liferay/commerce/notification/service/impl/CommerceNotificationQueueEntryLocalServiceImpl.java
+++ b/modules/apps/commerce/commerce-notification-service/src/main/java/com/liferay/commerce/notification/service/impl/CommerceNotificationQueueEntryLocalServiceImpl.java
@@ -30,12 +30,12 @@
import com.liferay.portal.kernel.util.OrderByComparator;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.mail.internet.InternetAddress;
+
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.mail.internet.InternetAddress;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-notification-web/build.gradle b/modules/apps/commerce/commerce-notification-web/build.gradle
index 5570d37fcec4d6..d784d9fb830f3e 100644
--- a/modules/apps/commerce/commerce-notification-web/build.gradle
+++ b/modules/apps/commerce/commerce-notification-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-account-item-selector-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/CommerceNotificationQueueEntriesDisplayContext.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/CommerceNotificationQueueEntriesDisplayContext.java
index 080e4d4cda46c4..ed09eab85315cc 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/CommerceNotificationQueueEntriesDisplayContext.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/CommerceNotificationQueueEntriesDisplayContext.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/CommerceNotificationTemplatesDisplayContext.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/CommerceNotificationTemplatesDisplayContext.java
index f2596f9e30b53e..87943307d3e780 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/CommerceNotificationTemplatesDisplayContext.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/CommerceNotificationTemplatesDisplayContext.java
@@ -17,13 +17,13 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/helper/CommerceNotificationsRequestHelper.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/helper/CommerceNotificationsRequestHelper.java
index 704a6a82a495e0..9f33150510fcf2 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/helper/CommerceNotificationsRequestHelper.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/display/context/helper/CommerceNotificationsRequestHelper.java
@@ -8,8 +8,8 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationEntryFDSActionProvider.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationEntryFDSActionProvider.java
index d1d53ca05cd8ba..21777db120591e 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationEntryFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationEntryFDSActionProvider.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationEntryFDSDataProvider.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationEntryFDSDataProvider.java
index f8ff9cdd87ff30..9dae38b1642656 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationEntryFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationEntryFDSDataProvider.java
@@ -27,9 +27,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationTemplateFDSActionProvider.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationTemplateFDSActionProvider.java
index 0e5c130c22a455..bd8661ac9d8a9f 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationTemplateFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationTemplateFDSActionProvider.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationTemplateFDSDataProvider.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationTemplateFDSDataProvider.java
index b5435b91433836..2333df5ac2c529 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationTemplateFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/data/set/provider/CommerceNotificationTemplateFDSDataProvider.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/taglib/servlet/taglib/CommerceChannelNotificationsQueueScreenNavigationEntry.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/taglib/servlet/taglib/CommerceChannelNotificationsQueueScreenNavigationEntry.java
index f6f0e946e76d2d..ed1f2a3725c260 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/taglib/servlet/taglib/CommerceChannelNotificationsQueueScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/taglib/servlet/taglib/CommerceChannelNotificationsQueueScreenNavigationEntry.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/taglib/servlet/taglib/CommerceChannelNotificationsTemplatesScreenNavigationEntry.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/taglib/servlet/taglib/CommerceChannelNotificationsTemplatesScreenNavigationEntry.java
index 3a532dd85138b1..a16ad5ba509827 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/taglib/servlet/taglib/CommerceChannelNotificationsTemplatesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/frontend/taglib/servlet/taglib/CommerceChannelNotificationsTemplatesScreenNavigationEntry.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationQueueEntryMVCActionCommand.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationQueueEntryMVCActionCommand.java
index c5a8f076f0ba29..fca1be3a3856a1 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationQueueEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationQueueEntryMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_notification_queue_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationTemplateMVCActionCommand.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationTemplateMVCActionCommand.java
index 0a7790246c381d..b172f7ba9660fe 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationTemplateMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationTemplateMVCActionCommand.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_notification_template"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationTemplateMVCRenderCommand.java b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationTemplateMVCRenderCommand.java
index 54f4ac797c4d05..f4be23eca190ed 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationTemplateMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-notification-web/src/main/java/com/liferay/commerce/notification/web/internal/portlet/action/EditCommerceNotificationTemplateMVCRenderCommand.java
@@ -19,14 +19,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_notification_template"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-notification-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-notification-web/src/main/resources/META-INF/resources/init.jsp
index ee736eaa7cc5eb..852784829680f4 100644
--- a/modules/apps/commerce/commerce-notification-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-notification-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-order-content-web/build.gradle b/modules/apps/commerce/commerce-order-content-web/build.gradle
index 4a2cb0ba17f342..f0161d26853c56 100644
--- a/modules/apps/commerce/commerce-order-content-web/build.gradle
+++ b/modules/apps/commerce/commerce-order-content-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.apache.commons", name: "commons-csv", version: "1.9.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/asset/display/page/portlet/CommerceOrderAssetDisplayPageFriendlyURLResolver.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/asset/display/page/portlet/CommerceOrderAssetDisplayPageFriendlyURLResolver.java
index bb89371803b74a..079a5890e12848 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/asset/display/page/portlet/CommerceOrderAssetDisplayPageFriendlyURLResolver.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/asset/display/page/portlet/CommerceOrderAssetDisplayPageFriendlyURLResolver.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.portlet.FriendlyURLResolver;
import com.liferay.portal.kernel.portlet.constants.FriendlyURLResolverConstants;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceOrderContentDisplayContext.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceOrderContentDisplayContext.java
index f5cd8442796a86..525a4b8b1b52c1 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceOrderContentDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceOrderContentDisplayContext.java
@@ -104,6 +104,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.webserver.WebServerServletTokenUtil;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.File;
import java.io.InputStream;
@@ -119,11 +124,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnContentDisplayContext.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnContentDisplayContext.java
index 99501b6c10f21e..806b83234f1c0c 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnContentDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnContentDisplayContext.java
@@ -71,6 +71,10 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.URLCodec;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -85,10 +89,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Gianmarco Brunialti Masera
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnItemCommentEditDisplayContext.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnItemCommentEditDisplayContext.java
index 7fbf33636fc1f3..af88cc68d1b67e 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnItemCommentEditDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/display/context/CommerceReturnItemCommentEditDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
/**
* @author Danny Situ
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceOpenOrderContentExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceOpenOrderContentExportImportPortletPreferencesProcessor.java
index 4b3a49da9ad43c..83f1161bf6ecbd 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceOpenOrderContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceOpenOrderContentExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Fabio Monaco
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
service = ExportImportPortletPreferencesProcessor.class
)
public class CommerceOpenOrderContentExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceOrderContentExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceOrderContentExportImportPortletPreferencesProcessor.java
index d9208a6e096803..fe2fa06c21cd6b 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceOrderContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceOrderContentExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Fabio Monaco
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
service = ExportImportPortletPreferencesProcessor.class
)
public class CommerceOrderContentExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/InfoBoxFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/InfoBoxFragmentRenderer.java
index fc231f3af7516b..2cb2c9cb7f7b60 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/InfoBoxFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/InfoBoxFragmentRenderer.java
@@ -60,6 +60,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
@@ -75,11 +80,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/InlineEditableOrderFieldFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/InlineEditableOrderFieldFragmentRenderer.java
index 844035e495c1b2..2cd7b65af41768 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/InlineEditableOrderFieldFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/InlineEditableOrderFieldFragmentRenderer.java
@@ -33,17 +33,17 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/MultishippingFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/MultishippingFragmentRenderer.java
index 041f130001908d..2e43b16378f501 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/MultishippingFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/MultishippingFragmentRenderer.java
@@ -32,16 +32,16 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderActionsFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderActionsFragmentRenderer.java
index f8110d5701401f..2496651f8a09ab 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderActionsFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderActionsFragmentRenderer.java
@@ -53,6 +53,13 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
@@ -62,13 +69,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderItemsDataSetFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderItemsDataSetFragmentRenderer.java
index 7fbda98972c809..fe353d03edd7ef 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderItemsDataSetFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderItemsDataSetFragmentRenderer.java
@@ -42,6 +42,13 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
@@ -52,13 +59,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderReturnsDataSetFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderReturnsDataSetFragmentRenderer.java
index 964dfd6147b6b4..10691eb8b940dd 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderReturnsDataSetFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrderReturnsDataSetFragmentRenderer.java
@@ -38,6 +38,11 @@
import com.liferay.portal.kernel.util.URLCodec;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
@@ -47,11 +52,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrdersDataSetFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrdersDataSetFragmentRenderer.java
index d32f42646f7f06..f73ce92f3ab4ce 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrdersDataSetFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/OrdersDataSetFragmentRenderer.java
@@ -51,6 +51,13 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.ArrayList;
@@ -62,13 +69,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/StatusLabelFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/StatusLabelFragmentRenderer.java
index 69636e106bde56..027efda1dd1195 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/StatusLabelFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/StatusLabelFragmentRenderer.java
@@ -30,17 +30,17 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/StepTrackerFragmentRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/StepTrackerFragmentRenderer.java
index 8972992e03e104..d96d5c4bd65552 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/StepTrackerFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/fragment/renderer/StepTrackerFragmentRenderer.java
@@ -22,16 +22,16 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceBillingAddressFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceBillingAddressFDSDataProvider.java
index 74e0e7693af29b..4144f151b33aa1 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceBillingAddressFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceBillingAddressFDSDataProvider.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceRefundItemFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceRefundItemFDSDataProvider.java
index 90d56a5bf07ebb..67231619dde648 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceRefundItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceRefundItemFDSDataProvider.java
@@ -33,6 +33,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -41,8 +43,6 @@
import java.util.Date;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceShippingAddressFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceShippingAddressFDSDataProvider.java
index 214a4a0d467a05..35e2643c32e0eb 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceShippingAddressFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceShippingAddressFDSDataProvider.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceWishListFDSActionProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceWishListFDSActionProvider.java
index fc8bb93e14bc2b..e804cbc87f6fb8 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceWishListFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceWishListFDSActionProvider.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.language.Language;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceWishListFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceWishListFDSDataProvider.java
index fab7878ef3e0b9..5ca1564db26459 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceWishListFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/CommerceWishListFDSDataProvider.java
@@ -19,13 +19,13 @@
import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/ImportCommerceOrderFDSActionProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/ImportCommerceOrderFDSActionProvider.java
index 1cb7a7fb813040..b656f1790b1531 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/ImportCommerceOrderFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/ImportCommerceOrderFDSActionProvider.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.language.Language;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/ImportCommerceOrderFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/ImportCommerceOrderFDSDataProvider.java
index 8d7ff3c9a956fa..920e895740cc4a 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/ImportCommerceOrderFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/ImportCommerceOrderFDSDataProvider.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderFDSActionProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderFDSActionProvider.java
index 03c81fb0dba1d7..726b721bf66088 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderFDSActionProvider.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderFDSDataProvider.java
index 6eb284f4d1a928..9806116ab339b2 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderFDSDataProvider.java
@@ -27,11 +27,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderItemFDSActionProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderItemFDSActionProvider.java
index 931a91d2ec6d41..3e46bf42fff884 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderItemFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderItemFDSActionProvider.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderItemFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderItemFDSDataProvider.java
index 5c04aa5777c2af..c0e24ca2a20098 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PendingCommerceOrderItemFDSDataProvider.java
@@ -44,6 +44,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -52,8 +54,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderFDSActionProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderFDSActionProvider.java
index e01ac2f6fb8f51..d9b3aadf9e8fd0 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderFDSActionProvider.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderFDSDataProvider.java
index 866ddf61b66b68..30155fefa509c1 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderFDSDataProvider.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderItemFDSActionProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderItemFDSActionProvider.java
index 5a1390811810f4..24ad256aff37db 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderItemFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderItemFDSActionProvider.java
@@ -25,11 +25,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderItemFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderItemFDSDataProvider.java
index 4444c74c111dba..dae2432340614d 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PlacedCommerceOrderItemFDSDataProvider.java
@@ -43,12 +43,12 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PreviewCommerceOrderItemFDSDataProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PreviewCommerceOrderItemFDSDataProvider.java
index 4290fec7767d84..288b10fd4476ff 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PreviewCommerceOrderItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/PreviewCommerceOrderItemFDSDataProvider.java
@@ -43,6 +43,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.text.ParseException;
@@ -54,8 +56,6 @@
import java.util.Locale;
import java.util.StringJoiner;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/search/OrderFDSKeywordsFactoryImpl.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/search/OrderFDSKeywordsFactoryImpl.java
index 5e7fa1c9bc6c6e..5d85b1054a6303 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/search/OrderFDSKeywordsFactoryImpl.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/provider/search/OrderFDSKeywordsFactoryImpl.java
@@ -10,7 +10,7 @@
import com.liferay.frontend.data.set.provider.search.FDSKeywordsFactory;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PendingCommerceOrderFDSAPIURLResolver.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PendingCommerceOrderFDSAPIURLResolver.java
index 5ce027009bfb67..d45245ce30d220 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PendingCommerceOrderFDSAPIURLResolver.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PendingCommerceOrderFDSAPIURLResolver.java
@@ -16,7 +16,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PendingCommerceOrderItemsFDSAPIURLResolver.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PendingCommerceOrderItemsFDSAPIURLResolver.java
index 59276528b3f1bc..5327f183aa5b9f 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PendingCommerceOrderItemsFDSAPIURLResolver.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PendingCommerceOrderItemsFDSAPIURLResolver.java
@@ -12,7 +12,7 @@
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderFDSAPIURLResolver.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderFDSAPIURLResolver.java
index 2f080a9efee3bb..a1f0d5e347320e 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderFDSAPIURLResolver.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderFDSAPIURLResolver.java
@@ -15,7 +15,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderItemsFDSAPIURLResolver.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderItemsFDSAPIURLResolver.java
index c1b228cf2de623..0208871de74dac 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderItemsFDSAPIURLResolver.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderItemsFDSAPIURLResolver.java
@@ -12,7 +12,7 @@
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderReturnsFDSAPIURLResolver.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderReturnsFDSAPIURLResolver.java
index ff2a8c90357ea3..3c2e5f6cbe73bf 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderReturnsFDSAPIURLResolver.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/url/PlacedCommerceOrderReturnsFDSAPIURLResolver.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.URLCodec;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/util/CommerceOrderFDSUtil.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/util/CommerceOrderFDSUtil.java
index fc596157ea6271..971253c55eff03 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/util/CommerceOrderFDSUtil.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/frontend/data/set/util/CommerceOrderFDSUtil.java
@@ -39,6 +39,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
@@ -48,12 +54,6 @@
import java.util.ResourceBundle;
import java.util.TimeZone;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/health/status/CommerceGuestCheckoutAuthenticationCommerceHealthStatus.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/health/status/CommerceGuestCheckoutAuthenticationCommerceHealthStatus.java
index 36edebfecac5ff..7037e5b434f629 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/health/status/CommerceGuestCheckoutAuthenticationCommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/health/status/CommerceGuestCheckoutAuthenticationCommerceHealthStatus.java
@@ -44,14 +44,14 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.portlet.PortletPreferences;
+
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
import java.util.TimeZone;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CSVCommerceOrderImporterTypeImpl.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CSVCommerceOrderImporterTypeImpl.java
index 57eb86878fcd46..162e3169f82895 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CSVCommerceOrderImporterTypeImpl.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CSVCommerceOrderImporterTypeImpl.java
@@ -48,6 +48,9 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.math.BigDecimal;
@@ -61,9 +64,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceOrdersCommerceOrderImporterTypeImpl.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceOrdersCommerceOrderImporterTypeImpl.java
index affaf2a5bd5cc4..ea6b9c8a148437 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceOrdersCommerceOrderImporterTypeImpl.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceOrdersCommerceOrderImporterTypeImpl.java
@@ -35,15 +35,15 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceWishListsCommerceOrderImporterTypeImpl.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceWishListsCommerceOrderImporterTypeImpl.java
index 609a961f5add6f..cf058b06aadb59 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceWishListsCommerceOrderImporterTypeImpl.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/importer/type/CommerceWishListsCommerceOrderImporterTypeImpl.java
@@ -41,6 +41,9 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.math.BigDecimal;
@@ -49,9 +52,6 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/info/item/renderer/CommerceOrderItemInfoItemRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/info/item/renderer/CommerceOrderItemInfoItemRenderer.java
index 2c9d47798516fb..f79ffae705ab50 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/info/item/renderer/CommerceOrderItemInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/info/item/renderer/CommerceOrderItemInfoItemRenderer.java
@@ -23,14 +23,14 @@
import com.liferay.portal.kernel.util.HashMapBuilder;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/info/list/renderer/BaseCommerceOrderItemBasicInfoListRenderer.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/info/list/renderer/BaseCommerceOrderItemBasicInfoListRenderer.java
index 3327bfe5ca4fae..5fb01eaafad712 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/info/list/renderer/BaseCommerceOrderItemBasicInfoListRenderer.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/info/list/renderer/BaseCommerceOrderItemBasicInfoListRenderer.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/item/selector/CommerceOrderItemSelectorView.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/item/selector/CommerceOrderItemSelectorView.java
index 0ed00203e60c82..58fe3d9fbc8ba0 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/item/selector/CommerceOrderItemSelectorView.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/item/selector/CommerceOrderItemSelectorView.java
@@ -24,6 +24,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
@@ -31,14 +39,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOpenOrderContentPortlet.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOpenOrderContentPortlet.java
index 21544384e1d647..0da9e4d0648bb2 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOpenOrderContentPortlet.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOpenOrderContentPortlet.java
@@ -44,19 +44,19 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -75,13 +75,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Open Carts",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/pending_commerce_orders/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Open Carts",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/pending_commerce_orders/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOpenOrderContentPortletProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOpenOrderContentPortletProvider.java
index e9c08ced95a7f7..60b9d94873e4f0 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOpenOrderContentPortletProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOpenOrderContentPortletProvider.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOrderContentPortlet.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOrderContentPortlet.java
index 335f4700e8bcef..da0054d05e4dfc 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOrderContentPortlet.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOrderContentPortlet.java
@@ -38,12 +38,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -63,13 +63,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Placed Orders",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/placed_commerce_orders/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Placed Orders",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/placed_commerce_orders/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOrderContentPortletProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOrderContentPortletProvider.java
index fd2f346e6f093b..26f89a9b31fc03 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOrderContentPortletProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceOrderContentPortletProvider.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceReturnContentPortlet.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceReturnContentPortlet.java
index 465cb8240359cb..21e649ea30d0e1 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceReturnContentPortlet.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceReturnContentPortlet.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -51,13 +51,13 @@
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Returns",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/returns/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Returns",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/returns/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceReturnContentPortletProvider.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceReturnContentPortletProvider.java
index 4b01bf79d2cfce..9175a47fb7cba6 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceReturnContentPortletProvider.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/CommerceReturnContentPortletProvider.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/CheckoutCommerceOrderMVCAction.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/CheckoutCommerceOrderMVCAction.java
index a4b75189386057..a8334226c63c88 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/CheckoutCommerceOrderMVCAction.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/CheckoutCommerceOrderMVCAction.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletURL;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletURL;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/checkout_open_order"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/CommerceOrderContentConfigurationAction.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/CommerceOrderContentConfigurationAction.java
index 481c9c072801e2..76158da56cef94 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/CommerceOrderContentConfigurationAction.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/CommerceOrderContentConfigurationAction.java
@@ -37,10 +37,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,7 +49,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
service = ConfigurationAction.class
)
public class CommerceOrderContentConfigurationAction
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderBillingAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderBillingAddressMVCRenderCommand.java
index e62b434e3ba5aa..fd45a55b722a5a 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderBillingAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderBillingAddressMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_billing_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCActionCommand.java
index 8ecc3a0b4c9b27..7d17be66514871 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCActionCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
index 1c67a4a7686492..6da22809e9ae74 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
@@ -26,10 +26,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderMVCActionCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderMVCActionCommand.java
index 7706831b5e41dc..b65d1720dc59cb 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderMVCActionCommand.java
@@ -56,15 +56,15 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.util.Calendar;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -74,10 +74,10 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_MINI,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_CART_CONTENT_TOTAL,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderMVCRenderCommand.java
index b42977eeb663e5..55117b2f165261 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderMVCRenderCommand.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNameMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNameMVCRenderCommand.java
index 622322364a201d..c2d48f70fadae6 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNameMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNameMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_name"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNoteMVCActionCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNoteMVCActionCommand.java
index e1c79394320817..22c9655ada845b 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNoteMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNoteMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_note"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNoteMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNoteMVCRenderCommand.java
index 20a3419e4edd57..68cfa0338b0ed9 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNoteMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNoteMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,8 +19,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_note"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNotesMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNotesMVCRenderCommand.java
index 4944876fa78e60..98b32fa9d8a7ac 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNotesMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderNotesMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,8 +19,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_notes"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderPurchaseOrderNumberMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderPurchaseOrderNumberMVCRenderCommand.java
index 89183d48484881..8551309a4b8d26 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderPurchaseOrderNumberMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderPurchaseOrderNumberMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_purchase_order_number"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderRequestedDeliveryDateMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderRequestedDeliveryDateMVCRenderCommand.java
index 3c575f7f81f68e..8a2e1f5768ea22 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderRequestedDeliveryDateMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderRequestedDeliveryDateMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_requested_delivery_date"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderShippingAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderShippingAddressMVCRenderCommand.java
index 19155a3a75afd2..45a946d8a1da7a 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderShippingAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceOrderShippingAddressMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/edit_commerce_order_shipping_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemCommentMVCActionCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemCommentMVCActionCommand.java
index 4864018a51b441..93469f03ba9228 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemCommentMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemCommentMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
"mvc.command.name=/commerce_return_content/edit_commerce_return_item_comment"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemCommentMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemCommentMVCRenderCommand.java
index 3daaa23a5ed2d4..9bb674dc1b8d35 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemCommentMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemCommentMVCRenderCommand.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
"mvc.command.name=/commerce_return_content/edit_commerce_return_item_comment"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemMVCRenderCommand.java
index ac0c60eb42f3c1..2754190f2e5eca 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnItemMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
"mvc.command.name=/commerce_return_content/edit_commerce_return_item"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnNoteMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnNoteMVCRenderCommand.java
index 33ed1b143a73be..e05afeb9844503 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnNoteMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/EditCommerceReturnNoteMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
"mvc.command.name=/commerce_return_content/edit_commerce_return_note"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ExportCommerceOrderReportMVCResourceCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ExportCommerceOrderReportMVCResourceCommand.java
index eae20bf8e5772c..24e8bfc45b25be 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ExportCommerceOrderReportMVCResourceCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ExportCommerceOrderReportMVCResourceCommand.java
@@ -34,13 +34,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.text.Format;
import java.util.List;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,7 +49,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_order_content/export_commerce_order_report"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ImportCSVMVCActionCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ImportCSVMVCActionCommand.java
index 9c5186afedd829..520df074bc65e9 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ImportCSVMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ImportCSVMVCActionCommand.java
@@ -33,6 +33,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.upload.UniqueFileNameProvider;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.io.InputStream;
@@ -41,10 +45,6 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
@@ -61,7 +61,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderImporterTypeConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/import_csv"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ImportCommerceOrderItemsMVCActionCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ImportCommerceOrderItemsMVCActionCommand.java
index 88c675156bb788..8f2fe80271577d 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ImportCommerceOrderItemsMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ImportCommerceOrderItemsMVCActionCommand.java
@@ -39,6 +39,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.math.BigDecimal;
import java.text.ParseException;
@@ -46,10 +50,6 @@
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -58,7 +58,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/import_commerce_order_items"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/OpenCommerceOrderContentConfigurationAction.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/OpenCommerceOrderContentConfigurationAction.java
index 0cb592ad7d55d8..50f0944f0c159a 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/OpenCommerceOrderContentConfigurationAction.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/OpenCommerceOrderContentConfigurationAction.java
@@ -37,10 +37,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,7 +49,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
service = ConfigurationAction.class
)
public class OpenCommerceOrderContentConfigurationAction
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/SelectCommerceOrderBillingAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/SelectCommerceOrderBillingAddressMVCRenderCommand.java
index 9cf7c051ba7d19..cf42d12675db57 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/SelectCommerceOrderBillingAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/SelectCommerceOrderBillingAddressMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/select_commerce_order_billing_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/SelectCommerceOrderShippingAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/SelectCommerceOrderShippingAddressMVCRenderCommand.java
index 480b385f7d9d10..8bb65f48916147 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/SelectCommerceOrderShippingAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/SelectCommerceOrderShippingAddressMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/select_commerce_order_shipping_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/UploadCSVFileEntryMVCActionCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/UploadCSVFileEntryMVCActionCommand.java
index b64b4ac19762c7..18039ef299afe2 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/UploadCSVFileEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/UploadCSVFileEntryMVCActionCommand.java
@@ -29,13 +29,13 @@
import com.liferay.upload.UploadHandler;
import com.liferay.upload.UploadResponseHandler;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.io.InputStream;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,7 +44,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/upload_csv_file_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderDeliveryTermsMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderDeliveryTermsMVCRenderCommand.java
index 556a89121b97de..c839c409603d2f 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderDeliveryTermsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderDeliveryTermsMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,8 +50,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_order_content/view_commerce_order_delivery_terms"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderDetailsMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderDetailsMVCRenderCommand.java
index cf8fbc1bbcef4a..5f7f52a6a9e915 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderDetailsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderDetailsMVCRenderCommand.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_order_content/view_commerce_order_details"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderImporterTypeMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderImporterTypeMVCRenderCommand.java
index 92717872d95b3e..7c6e6d21265707 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderImporterTypeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderImporterTypeMVCRenderCommand.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
"mvc.command.name=/commerce_open_order_content/view_commerce_order_importer_type"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderItemShipmentsMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderItemShipmentsMVCRenderCommand.java
index f0069560bd0eb4..01a3c8c1859186 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderItemShipmentsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderItemShipmentsMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_order_content/view_commerce_order_item_shipments"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderNotesMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderNotesMVCRenderCommand.java
index 0b88d59fbf7a6f..88bc8acc80db87 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderNotesMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderNotesMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_order_content/view_commerce_order_notes"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderOrderTypeModalMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderOrderTypeModalMVCRenderCommand.java
index bfdb0b9f8824de..5ace50ee4e1bd4 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderOrderTypeModalMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderOrderTypeModalMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,8 +19,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_order_content/view_commerce_order_order_type_modal"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderPaymentTermsMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderPaymentTermsMVCRenderCommand.java
index 4c6bfa02dc2b9e..c772100a931506 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderPaymentTermsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderPaymentTermsMVCRenderCommand.java
@@ -38,9 +38,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,8 +50,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_order_content/view_commerce_order_payment_terms"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderShipmentsMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderShipmentsMVCRenderCommand.java
index 298ce895348561..c305eac2fee062 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderShipmentsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceOrderShipmentsMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
"mvc.command.name=/commerce_order_content/view_commerce_order_shipments"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceRefundMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceRefundMVCRenderCommand.java
index 5df91a11980ea0..4107fe882512f2 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceRefundMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceRefundMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
"mvc.command.name=/commerce_return_content/view_commerce_refund"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceReturnMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceReturnMVCRenderCommand.java
index 2a1e939e22196c..1e603f9be13afe 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceReturnMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewCommerceReturnMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
"mvc.command.name=/commerce_return_content/view_commerce_return"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewReturnableCommerceOrderItemsMVCRenderCommand.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewReturnableCommerceOrderItemsMVCRenderCommand.java
index 74ca7976878a41..6fe4a62e1728ea 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewReturnableCommerceOrderItemsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/action/ViewReturnableCommerceOrderItemsMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,8 +19,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN_CONTENT,
"mvc.command.name=/commerce_order_content/view_returnable_commerce_order_items"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/display/template/CommerceOpenOrderContentPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/display/template/CommerceOpenOrderContentPortletDisplayTemplateHandler.java
index 126b5cc963cc11..a92412df247f8d 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/display/template/CommerceOpenOrderContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/display/template/CommerceOpenOrderContentPortletDisplayTemplateHandler.java
@@ -33,7 +33,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT,
service = TemplateHandler.class
)
public class CommerceOpenOrderContentPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/display/template/CommerceOrderContentPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/display/template/CommerceOrderContentPortletDisplayTemplateHandler.java
index 31519250c1c2c3..7f4d7753df3679 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/display/template/CommerceOrderContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/display/template/CommerceOrderContentPortletDisplayTemplateHandler.java
@@ -33,7 +33,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT,
service = TemplateHandler.class
)
public class CommerceOrderContentPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/route/CommerceOpenOrderContenFriendlyURLMapper.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/route/CommerceOpenOrderContenFriendlyURLMapper.java
index 3f5bbefe5aa0b0..ebe0d6e49ff07b 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/route/CommerceOpenOrderContenFriendlyURLMapper.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/route/CommerceOpenOrderContenFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/commerce-open-order-routes.xml",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_OPEN_ORDER_CONTENT
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/route/CommerceOrderContenFriendlyURLMapper.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/route/CommerceOrderContenFriendlyURLMapper.java
index 22cd964105f8f7..9f17150169c259 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/route/CommerceOrderContenFriendlyURLMapper.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/portlet/route/CommerceOrderContenFriendlyURLMapper.java
@@ -17,7 +17,7 @@
@Component(
property = {
"com.liferay.portlet.friendly-url-routes=META-INF/friendly-url-routes/commerce-placed-order-routes.xml",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_CONTENT
},
service = FriendlyURLMapper.class
)
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/template/CommerceOrderHttpHelperTemplateContextContributor.java b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/template/CommerceOrderHttpHelperTemplateContextContributor.java
index 895f2a6d6d2a38..c443c07651ef16 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/template/CommerceOrderHttpHelperTemplateContextContributor.java
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/java/com/liferay/commerce/order/content/web/internal/template/CommerceOrderHttpHelperTemplateContextContributor.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.order.CommerceOrderHttpHelper;
import com.liferay.portal.kernel.template.TemplateContextContributor;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/fragment/renderer/order_actions/init.jsp b/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/fragment/renderer/order_actions/init.jsp
index f4e4d875073c91..b8c5d61e552ccc 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/fragment/renderer/order_actions/init.jsp
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/fragment/renderer/order_actions/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/react" prefix="react" %><%@
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/fragment/renderer/orders_data_set/init.jsp b/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/fragment/renderer/orders_data_set/init.jsp
index 2106f4adb8a774..b40a4db5d88d76 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/fragment/renderer/orders_data_set/init.jsp
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/fragment/renderer/orders_data_set/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/frontend-data-set" prefix="frontend-data-set" %><%@
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/init.jsp
index 759c75ace21688..2c31da74ed8a9f 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -83,6 +83,8 @@ page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %><%@
page import="com.liferay.taglib.servlet.PipingServletResponseFactory" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.math.BigDecimal" %>
<%@ page import="java.text.Format" %>
@@ -95,8 +97,6 @@ page import="java.util.HashMap" %><%@
page import="java.util.List" %><%@
page import="java.util.Map" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/returns/init.jsp b/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/returns/init.jsp
index e6ba517abbb7b1..2c1276625ee543 100644
--- a/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/returns/init.jsp
+++ b/modules/apps/commerce/commerce-order-content-web/src/main/resources/META-INF/resources/returns/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-order-rule-api/build.gradle b/modules/apps/commerce/commerce-order-rule-api/build.gradle
index 4856b63f88be5f..a36bcec5b4c42f 100644
--- a/modules/apps/commerce/commerce-order-rule-api/build.gradle
+++ b/modules/apps/commerce/commerce-order-rule-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-order-rule-api/src/main/java/com/liferay/commerce/order/rule/entry/type/COREntryTypeJSPContributor.java b/modules/apps/commerce/commerce-order-rule-api/src/main/java/com/liferay/commerce/order/rule/entry/type/COREntryTypeJSPContributor.java
index c90d1d75d8b939..9ff89e7cd5abbd 100644
--- a/modules/apps/commerce/commerce-order-rule-api/src/main/java/com/liferay/commerce/order/rule/entry/type/COREntryTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-order-rule-api/src/main/java/com/liferay/commerce/order/rule/entry/type/COREntryTypeJSPContributor.java
@@ -5,8 +5,8 @@
package com.liferay.commerce.order.rule.entry.type;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-order-rule-service/build.gradle b/modules/apps/commerce/commerce-order-rule-service/build.gradle
index 5eb783f02ca1dc..1bbc37e7ba213c 100644
--- a/modules/apps/commerce/commerce-order-rule-service/build.gradle
+++ b/modules/apps/commerce/commerce-order-rule-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-order-rule-web/build.gradle b/modules/apps/commerce/commerce-order-rule-web/build.gradle
index eb811f63ec34be..f922d705cb8320 100644
--- a/modules/apps/commerce/commerce-order-rule-web/build.gradle
+++ b/modules/apps/commerce/commerce-order-rule-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/application/list/COREntryPanelApp.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/application/list/COREntryPanelApp.java
index 0e0c34f3485b8e..a7e6c1d6847947 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/application/list/COREntryPanelApp.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/application/list/COREntryPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + COREntryPortletKeys.COR_ENTRY + ")"
+ target = "(jakarta.portlet.name=" + COREntryPortletKeys.COR_ENTRY + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/COREntryDisplayContext.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/COREntryDisplayContext.java
index fd7c2cdfca28a9..14cb3fb7d874e5 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/COREntryDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/COREntryDisplayContext.java
@@ -40,17 +40,17 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/COREntryQualifiersDisplayContext.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/COREntryQualifiersDisplayContext.java
index 1cda1cb2556cae..59316312fe9100 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/COREntryQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/COREntryQualifiersDisplayContext.java
@@ -24,12 +24,12 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/helper/COREntryRequestHelper.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/helper/COREntryRequestHelper.java
index 11f3ccb31ed7f0..7816cea8ce8402 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/helper/COREntryRequestHelper.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/display/context/helper/COREntryRequestHelper.java
@@ -11,10 +11,10 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/entry/type/MinimumAmountCOREntryTypeJSPContributor.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/entry/type/MinimumAmountCOREntryTypeJSPContributor.java
index 05ede3a9b63b81..488b3ace8fed8f 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/entry/type/MinimumAmountCOREntryTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/entry/type/MinimumAmountCOREntryTypeJSPContributor.java
@@ -9,9 +9,9 @@
import com.liferay.commerce.order.rule.entry.type.COREntryTypeJSPContributor;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/entry/type/ProductsLimitCOREntryTypeJSPContributor.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/entry/type/ProductsLimitCOREntryTypeJSPContributor.java
index 42baefba1e469a..c02181c496e3e2 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/entry/type/ProductsLimitCOREntryTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/entry/type/ProductsLimitCOREntryTypeJSPContributor.java
@@ -9,9 +9,9 @@
import com.liferay.commerce.order.rule.entry.type.COREntryTypeJSPContributor;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/data/set/provider/ProductsLimitCOREntryFDSActionProvider.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/data/set/provider/ProductsLimitCOREntryFDSActionProvider.java
index ec0f8fab425f3b..2c08f5bb4346c7 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/data/set/provider/ProductsLimitCOREntryFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/data/set/provider/ProductsLimitCOREntryFDSActionProvider.java
@@ -21,11 +21,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/data/set/provider/ProductsLimitCOREntryFDSDataProvider.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/data/set/provider/ProductsLimitCOREntryFDSDataProvider.java
index 13dd5b18792ec0..7822718368b6c1 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/data/set/provider/ProductsLimitCOREntryFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/data/set/provider/ProductsLimitCOREntryFDSDataProvider.java
@@ -28,9 +28,9 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/taglib/servlet/taglib/COREntryDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/taglib/servlet/taglib/COREntryDetailsScreenNavigationEntry.java
index 731aabecc2ae78..2cf09a2478226d 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/taglib/servlet/taglib/COREntryDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/taglib/servlet/taglib/COREntryDetailsScreenNavigationEntry.java
@@ -22,10 +22,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/taglib/servlet/taglib/COREntryQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/taglib/servlet/taglib/COREntryQualifiersScreenNavigationEntry.java
index c0e49225e982b1..f1f7287e25dfc0 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/taglib/servlet/taglib/COREntryQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/frontend/taglib/servlet/taglib/COREntryQualifiersScreenNavigationEntry.java
@@ -23,10 +23,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/COREntryPortlet.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/COREntryPortlet.java
index bd0c5c37e06e05..312d4a56e6d9bd 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/COREntryPortlet.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/COREntryPortlet.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,13 +41,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Order Rules",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Order Rules",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/AddCOREntryMVCRenderCommand.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/AddCOREntryMVCRenderCommand.java
index a326cddb4dfed5..91be04f90feae9 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/AddCOREntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/AddCOREntryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.order.rule.constants.COREntryPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
+ "jakarta.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
"mvc.command.name=/cor_entry/add_cor_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryExternalReferenceCodeMVCActionCommand.java
index 904070b085146c..582b0fc444de22 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryExternalReferenceCodeMVCActionCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
+ "jakarta.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
"mvc.command.name=/cor_entry/edit_cor_entry_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryExternalReferenceCodeMVCRenderCommand.java
index a5811b3c41739f..0fe4bbb7776315 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.order.rule.constants.COREntryPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
+ "jakarta.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
"mvc.command.name=/cor_entry/edit_cor_entry_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryMVCActionCommand.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryMVCActionCommand.java
index eb2a157244b0df..11bf23d53c2fd6 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryMVCActionCommand.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
+ "jakarta.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
"mvc.command.name=/cor_entry/edit_cor_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryMVCRenderCommand.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryMVCRenderCommand.java
index e3aab04e07aae4..07d6551dbb12cf 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.order.rule.constants.COREntryPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
+ "jakarta.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
"mvc.command.name=/cor_entry/edit_cor_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryQualifiersMVCActionCommand.java
index dd1e00bafd4e71..5bf44176c6e61a 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/java/com/liferay/commerce/order/rule/web/internal/portlet/action/EditCOREntryQualifiersMVCActionCommand.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
+ "jakarta.portlet.name=" + COREntryPortletKeys.COR_ENTRY,
"mvc.command.name=/cor_entry/edit_cor_entry_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-rule-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-order-rule-web/src/main/resources/META-INF/resources/init.jsp
index e2155a5fbb0398..7cb5f0837f4adc 100644
--- a/modules/apps/commerce/commerce-order-rule-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-order-rule-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -41,9 +41,9 @@ page import="com.liferay.portal.kernel.util.WebKeys" %><%@
page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@
page import="com.liferay.taglib.servlet.PipingServletResponseFactory" %>
-<%@ page import="java.util.Objects" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
-<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="java.util.Objects" %>
diff --git a/modules/apps/commerce/commerce-order-web/build.gradle b/modules/apps/commerce/commerce-order-web/build.gradle
index d8980f7a2dc9a6..9c2d6caf0abd19 100644
--- a/modules/apps/commerce/commerce-order-web/build.gradle
+++ b/modules/apps/commerce/commerce-order-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceOrderPanelApp.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceOrderPanelApp.java
index 247fc25c25aa21..063d21c03d4274 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceOrderPanelApp.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceOrderPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER + ")"
+ target = "(jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceOrderTypePanelApp.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceOrderTypePanelApp.java
index 41ee6369ff5fc6..52675fa1529250 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceOrderTypePanelApp.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceOrderTypePanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE + ")"
+ target = "(jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceReturnPanelApp.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceReturnPanelApp.java
index 31b5b0318141a1..2cfbefefc0f9a4 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceReturnPanelApp.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/application/list/CommerceReturnPanelApp.java
@@ -52,7 +52,7 @@ public boolean isShow(PermissionChecker permissionChecker, Group group)
}
@Reference(
- target = "(javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN + ")"
+ target = "(jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/asset/CommerceOrderAssetRenderer.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/asset/CommerceOrderAssetRenderer.java
index 29025967464397..6b924d52507ae9 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/asset/CommerceOrderAssetRenderer.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/asset/CommerceOrderAssetRenderer.java
@@ -27,15 +27,15 @@
import com.liferay.portal.kernel.service.GroupLocalServiceUtil;
import com.liferay.portal.kernel.util.PortalUtil;
-import java.util.Locale;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
+import java.util.ResourceBundle;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/asset/CommerceOrderAssetRendererFactory.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/asset/CommerceOrderAssetRendererFactory.java
index d8938c01e2c668..3f8ad32febd817 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/asset/CommerceOrderAssetRendererFactory.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/asset/CommerceOrderAssetRendererFactory.java
@@ -16,7 +16,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portlet.asset.model.impl.AssetEntryImpl;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
* @author Andrea Di Giorgi
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
service = AssetRendererFactory.class
)
public class CommerceOrderAssetRendererFactory
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/custom/attributes/CommerceOrderCustomAttributesDisplay.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/custom/attributes/CommerceOrderCustomAttributesDisplay.java
index fd789cdfec88f4..55073d0596d8e1 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/custom/attributes/CommerceOrderCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/custom/attributes/CommerceOrderCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Ethan Bustad
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
service = CustomAttributesDisplay.class
)
public class CommerceOrderCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/custom/attributes/CommerceOrderItemCustomAttributesDisplay.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/custom/attributes/CommerceOrderItemCustomAttributesDisplay.java
index 5125a3b4d46081..d8d2e640a5cc80 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/custom/attributes/CommerceOrderItemCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/custom/attributes/CommerceOrderItemCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Ethan Bustad
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
service = CustomAttributesDisplay.class
)
public class CommerceOrderItemCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderEditDisplayContext.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderEditDisplayContext.java
index 4025319f93098c..2e0c1ac860a537 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderEditDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderEditDisplayContext.java
@@ -63,6 +63,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.webserver.WebServerServletTokenUtil;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -73,9 +76,6 @@
import java.util.Date;
import java.util.List;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-
/**
* @author Andrea Di Giorgi
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderListDisplayContext.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderListDisplayContext.java
index f35e01655f0098..82c8bb5ced3d51 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderListDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderListDisplayContext.java
@@ -30,11 +30,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
+import java.util.List;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderNoteEditDisplayContext.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderNoteEditDisplayContext.java
index c2897b6121e668..447d874677857d 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderNoteEditDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderNoteEditDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderTypeDisplayContext.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderTypeDisplayContext.java
index d2f53166a3f4df..0d3832b96dca2c 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderTypeDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderTypeDisplayContext.java
@@ -31,14 +31,14 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.taglib.util.CustomAttributesUtil;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderTypeQualifiersDisplayContext.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderTypeQualifiersDisplayContext.java
index b2b46d14bbcf3a..e49192b9f5fa3d 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderTypeQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceOrderTypeQualifiersDisplayContext.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnEditDisplayContext.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnEditDisplayContext.java
index 4411bc02c46077..ad922d5648c5c6 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnEditDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnEditDisplayContext.java
@@ -68,6 +68,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.webserver.WebServerServletTokenUtil;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -83,11 +88,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Stefano Motta
*/
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnItemCommentEditDisplayContext.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnItemCommentEditDisplayContext.java
index 21d09c996341c0..74829915ba9639 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnItemCommentEditDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnItemCommentEditDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
/**
* @author Danny Situ
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnListDisplayContext.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnListDisplayContext.java
index 73acaf74a28176..81b7ca188df306 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnListDisplayContext.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/CommerceReturnListDisplayContext.java
@@ -25,11 +25,11 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
+import java.util.List;
/**
* @author Stefano Motta
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/helper/CommerceOrderRequestHelper.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/helper/CommerceOrderRequestHelper.java
index 070aa3d9d56021..4cc41959697d69 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/helper/CommerceOrderRequestHelper.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/helper/CommerceOrderRequestHelper.java
@@ -11,10 +11,10 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/helper/CommerceReturnRequestHelper.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/helper/CommerceReturnRequestHelper.java
index ba35f82af8c1db..1e5a59565e5a62 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/helper/CommerceReturnRequestHelper.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/display/context/helper/CommerceReturnRequestHelper.java
@@ -11,10 +11,10 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Stefano Motta
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceBillingAddressFDSDataProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceBillingAddressFDSDataProvider.java
index 097faf5737fd2f..bc59ea3803b3b3 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceBillingAddressFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceBillingAddressFDSDataProvider.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceNotificationFDSDataProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceNotificationFDSDataProvider.java
index 35706025a00507..4523002fec6471 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceNotificationFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceNotificationFDSDataProvider.java
@@ -38,13 +38,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Date;
-import java.util.List;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceOrderItemFDSActionProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceOrderItemFDSActionProvider.java
index b58ac23a917da9..6de80db6f1475d 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceOrderItemFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceOrderItemFDSActionProvider.java
@@ -27,14 +27,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceOrderItemFDSDataProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceOrderItemFDSDataProvider.java
index 20ce6b8fdbca35..c0f4fb36600c85 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceOrderItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceOrderItemFDSDataProvider.java
@@ -46,6 +46,8 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.Format;
import java.util.ArrayList;
@@ -55,8 +57,6 @@
import java.util.Locale;
import java.util.StringJoiner;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommercePaymentFDSDataProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommercePaymentFDSDataProvider.java
index 68632dc9334bbc..2ffaebf3700d58 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommercePaymentFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommercePaymentFDSDataProvider.java
@@ -26,14 +26,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSDataProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSDataProvider.java
index db6ea57f6da41a..c4f7a478a480ca 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommercePaymentMethodFDSDataProvider.java
@@ -37,12 +37,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceRefundFDSActionProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceRefundFDSActionProvider.java
index ba48d365e3635e..7c0565afa0f5a0 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceRefundFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceRefundFDSActionProvider.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceRefundFDSDataProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceRefundFDSDataProvider.java
index 194864f5133a92..52bec95e4454de 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceRefundFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceRefundFDSDataProvider.java
@@ -29,6 +29,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -37,8 +39,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceShippingAddressFDSDataProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceShippingAddressFDSDataProvider.java
index 5c41281cc085c7..b9aca6c131a80e 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceShippingAddressFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/data/set/provider/CommerceShippingAddressFDSDataProvider.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderCustomFieldsScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderCustomFieldsScreenNavigationEntry.java
index 2b7f2b7077b6bb..0e7be4f05341d7 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderCustomFieldsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderCustomFieldsScreenNavigationEntry.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.taglib.util.CustomAttributesUtil;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderEmailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderEmailsScreenNavigationEntry.java
index 99cc6bee80224a..17a4e265022cf4 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderEmailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderEmailsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderGeneralScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderGeneralScreenNavigationEntry.java
index e004c920aa3339..125d7df184e761 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderGeneralScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderGeneralScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemDetailScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemDetailScreenNavigationEntry.java
index 08ab6069eafd19..4d4ef7fa1736ac 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemDetailScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemDetailScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemDetailsCustomFieldsScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemDetailsCustomFieldsScreenNavigationEntry.java
index 083dacc4e4c35a..d2c55beabc9047 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemDetailsCustomFieldsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemDetailsCustomFieldsScreenNavigationEntry.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.taglib.util.CustomAttributesUtil;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderNotesScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderNotesScreenNavigationEntry.java
index 86e3772e6d2e23..d1b56000cdc32b 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderNotesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderNotesScreenNavigationEntry.java
@@ -19,14 +19,14 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderPaymentsScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderPaymentsScreenNavigationEntry.java
index cd553f15537029..236009d78733bf 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderPaymentsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderPaymentsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderShipmentsScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderShipmentsScreenNavigationEntry.java
index 29b51c071a0ffb..62ccd3fa98bea3 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderShipmentsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderShipmentsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderShippingSummaryScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderShippingSummaryScreenNavigationEntry.java
index 88bdb68322e883..026a3e8f2d6b70 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderShippingSummaryScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderShippingSummaryScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderTypeDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderTypeDetailsScreenNavigationEntry.java
index 0c7d0e3ccb2692..798fc02aae0df2 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderTypeDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderTypeDetailsScreenNavigationEntry.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderTypeQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderTypeQualifiersScreenNavigationEntry.java
index bf26f8a5df5a1f..c7ebe88f243e7d 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderTypeQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceOrderTypeQualifiersScreenNavigationEntry.java
@@ -20,10 +20,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceReturnGeneralScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceReturnGeneralScreenNavigationEntry.java
index f91cbea3d49d93..21822448b8ab36 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceReturnGeneralScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceReturnGeneralScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceReturnItemDetailScreenNavigationEntry.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceReturnItemDetailScreenNavigationEntry.java
index d65705dd7ccfea..d3ffe2f65faf37 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceReturnItemDetailScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/frontend/taglib/servlet/taglib/CommerceReturnItemDetailScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderPortlet.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderPortlet.java
index c953b2f146d574..d28423ffb9ca13 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderPortlet.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderPortlet.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,12 +38,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Orders", "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Orders",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderPortletProvider.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderPortletProvider.java
index 999497711267ce..3d7df8a6abb151 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderPortletProvider.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderPortletProvider.java
@@ -16,10 +16,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderTypePortlet.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderTypePortlet.java
index ced4948eaf09d2..26b87b56357886 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderTypePortlet.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceOrderTypePortlet.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,13 +38,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Order Types",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/commerce_order_type/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Order Types",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/commerce_order_type/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceReturnPortlet.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceReturnPortlet.java
index 423655fc1da8e1..ed9ce38b10d794 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceReturnPortlet.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/CommerceReturnPortlet.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,13 +37,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Returns",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/commerce_return/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Returns",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/commerce_return/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/AddCommerceOrderTypeMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/AddCommerceOrderTypeMVCRenderCommand.java
index ca424477a455b4..846f362a6953cf 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/AddCommerceOrderTypeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/AddCommerceOrderTypeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
"mvc.command.name=/commerce_order_type/add_commerce_order_type"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderBillingAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderBillingAddressMVCRenderCommand.java
index 061a47df472321..3fd7088b311042 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderBillingAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderBillingAddressMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_billing_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderDeliveryTermsMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderDeliveryTermsMVCRenderCommand.java
index 463c0b3626ca36..8938c9a3b26733 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderDeliveryTermsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderDeliveryTermsMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_delivery_terms"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCActionCommand.java
index 0045837225ae91..5e8c874e1cd980 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCRenderCommand.java
index 9cdff23e75abce..914e0576602d56 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderExternalReferenceCodeMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
index d1e56bad83a4b7..a28fb8d0321980 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderItemMVCActionCommand.java
@@ -31,13 +31,13 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -47,7 +47,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderItemMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderItemMVCRenderCommand.java
index 38387d3a7c9a56..9e0860f9f76716 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderItemMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderItemMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_item"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderMVCActionCommand.java
index b97c5cc6d6fce1..2eeb581bd270bf 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderMVCActionCommand.java
@@ -44,14 +44,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.util.Calendar;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -61,7 +61,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderMVCRenderCommand.java
index d7d4d318ff15ea..004bac5aaf8b12 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderMVCRenderCommand.java
@@ -34,11 +34,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -52,7 +52,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNameMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNameMVCRenderCommand.java
index 682ee56dd09d11..f4d4a8a3eb6f68 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNameMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNameMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_name"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNoteMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNoteMVCActionCommand.java
index 137594bce5e64e..4370cac651ee63 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNoteMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNoteMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_note"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNoteMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNoteMVCRenderCommand.java
index e1594d5138f7d0..11b049d03c3e53 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNoteMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderNoteMVCRenderCommand.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_note"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentMethodMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentMethodMVCRenderCommand.java
index b09d78dccb32eb..05cc5ee820cda0 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentMethodMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentMethodMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_payment_method"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentStatusMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentStatusMVCRenderCommand.java
index 740bd084f864d0..5de6cc3656644a 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentStatusMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentStatusMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_payment_status"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentTermsMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentTermsMVCRenderCommand.java
index 2569b92f971e50..0040626d9e6cf7 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentTermsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPaymentTermsMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_payment_terms"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPrintedNoteMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPrintedNoteMVCRenderCommand.java
index cac0abf5fbef80..757fe41f92386d 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPrintedNoteMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPrintedNoteMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_printed_note"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPurchaseOrderNumberMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPurchaseOrderNumberMVCRenderCommand.java
index 89a790711968f1..57c74d0a1aec30 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPurchaseOrderNumberMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderPurchaseOrderNumberMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_purchase_order_number"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderRequestedDeliveryDateMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderRequestedDeliveryDateMVCRenderCommand.java
index 121a237d725e62..71293ac4429555 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderRequestedDeliveryDateMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderRequestedDeliveryDateMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_requested_delivery_date"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderShipmentMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderShipmentMVCRenderCommand.java
index bb5488ffed665a..36d4b1760b8570 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderShipmentMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderShipmentMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_shipment"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderShippingAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderShippingAddressMVCRenderCommand.java
index bf0ed63e90a896..1915449d7ecf8b 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderShippingAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderShippingAddressMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_shipping_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderSummaryMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderSummaryMVCRenderCommand.java
index 7df133e8676c01..74feae24aa27c6 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderSummaryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderSummaryMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_order_summary"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeExternalReferenceCodeMVCActionCommand.java
index 75e5b9633eb36d..bac62d529dc8fd 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeExternalReferenceCodeMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
"mvc.command.name=/commerce_order_type/edit_commerce_order_type_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeExternalReferenceCodeMVCRenderCommand.java
index ac9b1e9347b9e2..25164f12fbd6b0 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
"mvc.command.name=/commerce_order_type/edit_commerce_order_type_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeMVCActionCommand.java
index df31758f2e9c1d..08557e0c77f522 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeMVCActionCommand.java
@@ -18,13 +18,13 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
"mvc.command.name=/commerce_order_type/edit_commerce_order_type"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeMVCRenderCommand.java
index 43bf887ac2ba0f..ce38f185cab34e 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
"mvc.command.name=/commerce_order_type/edit_commerce_order_type"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeQualifiersMVCActionCommand.java
index 5ca83f54bfad3a..2f1b8eb522ef77 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceOrderTypeQualifiersMVCActionCommand.java
@@ -14,10 +14,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER_TYPE,
"mvc.command.name=/commerce_order_type/edit_commerce_order_type_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnExternalReferenceCodeMVCActionCommand.java
index f0f2f088f7f655..9460aba3c62964 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnExternalReferenceCodeMVCActionCommand.java
@@ -19,13 +19,13 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.io.Serializable;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnExternalReferenceCodeMVCRenderCommand.java
index 9b9b22b1f477c6..2317104c3461e5 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnExternalReferenceCodeMVCRenderCommand.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemCommentMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemCommentMVCActionCommand.java
index 3f9e9ddde9a1e6..409ff40c2a87b0 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemCommentMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemCommentMVCActionCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return_item_comment"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemCommentMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemCommentMVCRenderCommand.java
index 69e62576eb9a62..924976975e6ff7 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemCommentMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemCommentMVCRenderCommand.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return_item_comment"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemMVCRenderCommand.java
index a237087547a4e4..4fdda89b8c3717 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnItemMVCRenderCommand.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return_item"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnMVCActionCommand.java
index d27d79e5c667ab..dd6595009012b6 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnMVCActionCommand.java
@@ -17,13 +17,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.io.Serializable;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnMVCRenderCommand.java
index 0b8e6b446cf994..26d226bcf3c70a 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnMVCRenderCommand.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnNoteMVCActionCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnNoteMVCActionCommand.java
index c48233b7431a7f..9880dcbf6d4cf2 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnNoteMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnNoteMVCActionCommand.java
@@ -18,13 +18,13 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.io.Serializable;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return_note"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnNoteMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnNoteMVCRenderCommand.java
index 0618e19ca3040a..6bddbecc86504d 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnNoteMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceReturnNoteMVCRenderCommand.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_RETURN,
"mvc.command.name=/commerce_return/edit_commerce_return_note"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java
index e462be479548aa..253772d22d6b47 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_shipment"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/SelectCommerceOrderBillingAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/SelectCommerceOrderBillingAddressMVCRenderCommand.java
index c2f37b048ec456..f38f5fcf0984f3 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/SelectCommerceOrderBillingAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/SelectCommerceOrderBillingAddressMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/select_commerce_order_billing_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/SelectCommerceOrderShippingAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/SelectCommerceOrderShippingAddressMVCRenderCommand.java
index 0747f6ad2b1cb4..151d347dd46716 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/SelectCommerceOrderShippingAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/SelectCommerceOrderShippingAddressMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/select_commerce_order_shipping_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/ViewCommerceNotificationQueueEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/ViewCommerceNotificationQueueEntryMVCRenderCommand.java
index 276e662192f09f..fe3f2ce9659e2b 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/ViewCommerceNotificationQueueEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/portlet/action/ViewCommerceNotificationQueueEntryMVCRenderCommand.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -49,7 +49,7 @@
@Component(
configurationPid = "com.liferay.commerce.configuration.CommerceOrderItemDecimalQuantityConfiguration",
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/view_commerce_notification_queue_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderChecker.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderChecker.java
index ded690f694d161..93b25b1585f8e9 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderChecker.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderChecker.java
@@ -13,7 +13,7 @@
import com.liferay.portal.kernel.security.permission.ActionKeys;
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
-import javax.portlet.PortletResponse;
+import jakarta.portlet.PortletResponse;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderDisplayTerms.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderDisplayTerms.java
index fca53c94bdf64b..ab4adc38bbae27 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderDisplayTerms.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderDisplayTerms.java
@@ -10,11 +10,11 @@
import com.liferay.portal.kernel.util.CalendarFactoryUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.PortletRequest;
+
import java.util.Calendar;
import java.util.Date;
-import javax.portlet.PortletRequest;
-
/**
* @author Andrea Di Giorgi
*/
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemDisplayTerms.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemDisplayTerms.java
index ffdffa37b432d5..e40dda452d6d65 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemDisplayTerms.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemDisplayTerms.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.dao.search.DisplayTerms;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemSearch.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemSearch.java
index 9552d73f4fc570..186d9d723f7ec6 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemSearch.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemSearch.java
@@ -13,13 +13,13 @@
import com.liferay.portal.kernel.portlet.SearchOrderByUtil;
import com.liferay.portal.kernel.util.LinkedHashMapBuilder;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author Andrea Di Giorgi
*/
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemSearchTerms.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemSearchTerms.java
index caf8dbebfa4cb2..34c33ed6e95b8f 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemSearchTerms.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderItemSearchTerms.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.dao.search.DAOParamUtil;
-import javax.portlet.PortletRequest;
+import jakarta.portlet.PortletRequest;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderSearch.java b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderSearch.java
index b7914421bc6a23..14093608a7f83e 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderSearch.java
+++ b/modules/apps/commerce/commerce-order-web/src/main/java/com/liferay/commerce/order/web/internal/search/CommerceOrderSearch.java
@@ -13,13 +13,13 @@
import com.liferay.portal.kernel.portlet.SearchOrderByUtil;
import com.liferay.portal.kernel.util.LinkedHashMapBuilder;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
/**
* @author Andrea Di Giorgi
*/
diff --git a/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/init.jsp
index 74f840112aebef..284ab5e8fe9edc 100644
--- a/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-order-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -96,6 +96,8 @@ page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %><%@
page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.text.Format" %>
<%@ page import="java.util.Calendar" %><%@
@@ -106,8 +108,6 @@ page import="java.util.List" %><%@
page import="java.util.Map" %><%@
page import="java.util.Objects" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-payment-api/build.gradle b/modules/apps/commerce/commerce-payment-api/build.gradle
index c3e56d9d0165bb..de093423f724fd 100644
--- a/modules/apps/commerce/commerce-payment-api/build.gradle
+++ b/modules/apps/commerce/commerce-payment-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/gateway/CommercePaymentGateway.java b/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/gateway/CommercePaymentGateway.java
index 822d34ee38ce33..80b3223e7f725e 100644
--- a/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/gateway/CommercePaymentGateway.java
+++ b/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/gateway/CommercePaymentGateway.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.payment.model.CommercePaymentEntry;
import com.liferay.portal.kernel.exception.PortalException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/integration/CommercePaymentIntegration.java b/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/integration/CommercePaymentIntegration.java
index 08c93ea96510bc..4232cd9379df43 100644
--- a/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/integration/CommercePaymentIntegration.java
+++ b/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/integration/CommercePaymentIntegration.java
@@ -10,9 +10,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.UnicodeProperties;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/util/CommercePaymentHelper.java b/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/util/CommercePaymentHelper.java
index f6a0039387fc76..d891a0faba5e71 100644
--- a/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/util/CommercePaymentHelper.java
+++ b/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/util/CommercePaymentHelper.java
@@ -15,9 +15,9 @@
import com.liferay.commerce.payment.result.CommercePaymentResult;
import com.liferay.portal.kernel.exception.PortalException;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/util/CommercePaymentHttpHelper.java b/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/util/CommercePaymentHttpHelper.java
index 28f8f9b997774d..d87ab5cb81b12e 100644
--- a/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/util/CommercePaymentHttpHelper.java
+++ b/modules/apps/commerce/commerce-payment-api/src/main/java/com/liferay/commerce/payment/util/CommercePaymentHttpHelper.java
@@ -9,7 +9,7 @@
import com.liferay.commerce.model.CommerceOrder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alec Sloan
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/build.gradle b/modules/apps/commerce/commerce-payment-method-authorize-net/build.gradle
index 2655c9458c182d..20ba8250bdbac4 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/build.gradle
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/build.gradle
@@ -2,12 +2,12 @@ dependencies {
compileInclude group: "net.authorize", name: "anet-java-sdk", version: "2.0.6"
compileOnly group: "com.google.code.gson", name: "gson", version: "2.9.0"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-currency-api")
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/AuthorizeNetCommercePaymentRequest.java b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/AuthorizeNetCommercePaymentRequest.java
index 441642fbb8b0b2..cb9a179a1a6b93 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/AuthorizeNetCommercePaymentRequest.java
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/AuthorizeNetCommercePaymentRequest.java
@@ -7,12 +7,12 @@
import com.liferay.commerce.payment.request.CommercePaymentRequest;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Luca Pellizzon
*/
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/AuthorizeNetCommercePaymentRequestProvider.java b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/AuthorizeNetCommercePaymentRequestProvider.java
index ca716afe087143..70b61e807cc205 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/AuthorizeNetCommercePaymentRequestProvider.java
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/AuthorizeNetCommercePaymentRequestProvider.java
@@ -11,9 +11,9 @@
import com.liferay.commerce.service.CommerceOrderLocalService;
import com.liferay.portal.kernel.exception.PortalException;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/frontend/taglib/servlet/taglib/AuthorizeNetCommercePaymentMethodConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/frontend/taglib/servlet/taglib/AuthorizeNetCommercePaymentMethodConfigurationScreenNavigationEntry.java
index c4d990534777f2..01333e2bb99ddd 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/frontend/taglib/servlet/taglib/AuthorizeNetCommercePaymentMethodConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/frontend/taglib/servlet/taglib/AuthorizeNetCommercePaymentMethodConfigurationScreenNavigationEntry.java
@@ -21,14 +21,14 @@
import com.liferay.portal.kernel.settings.ParameterMapSettingsLocator;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/portlet/action/EditAuthorizeNetCommercePaymentMethodConfigurationMVCActionCommand.java b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/portlet/action/EditAuthorizeNetCommercePaymentMethodConfigurationMVCActionCommand.java
index 4caf486fae2103..149aead254ab95 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/portlet/action/EditAuthorizeNetCommercePaymentMethodConfigurationMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/portlet/action/EditAuthorizeNetCommercePaymentMethodConfigurationMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
"mvc.command.name=/commerce_payment_methods/edit_authorize_net_commerce_payment_method_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/CompletePaymentAuthorizeNetServlet.java b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/CompletePaymentAuthorizeNetServlet.java
index c8ea10df499d25..59170784acbcb4 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/CompletePaymentAuthorizeNetServlet.java
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/CompletePaymentAuthorizeNetServlet.java
@@ -14,18 +14,18 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.net.URL;
import java.util.Objects;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/StartPaymentAuthorizeNetServlet.java b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/StartPaymentAuthorizeNetServlet.java
index 2b7b5f4f11c3d6..fc632ac93cac28 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/StartPaymentAuthorizeNetServlet.java
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/StartPaymentAuthorizeNetServlet.java
@@ -11,15 +11,15 @@
import com.liferay.portal.kernel.servlet.PortalSessionThreadLocal;
import com.liferay.portal.kernel.util.Portal;
-import java.io.IOException;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/filter/CompletePaymentAuthorizeNetAuthVerifierFilter.java b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/filter/CompletePaymentAuthorizeNetAuthVerifierFilter.java
index dceb588f4c3d3e..0858191cb86a80 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/filter/CompletePaymentAuthorizeNetAuthVerifierFilter.java
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/filter/CompletePaymentAuthorizeNetAuthVerifierFilter.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.payment.method.authorize.net.internal.constants.AuthorizeNetCommercePaymentMethodConstants;
import com.liferay.portal.servlet.filters.authverifier.AuthVerifierFilter;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/filter/StartPaymentAuthorizeNetAuthVerifierFilter.java b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/filter/StartPaymentAuthorizeNetAuthVerifierFilter.java
index 32bcd91a878111..c132ab1a51a348 100644
--- a/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/filter/StartPaymentAuthorizeNetAuthVerifierFilter.java
+++ b/modules/apps/commerce/commerce-payment-method-authorize-net/src/main/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/filter/StartPaymentAuthorizeNetAuthVerifierFilter.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.payment.method.authorize.net.internal.constants.AuthorizeNetCommercePaymentMethodConstants;
import com.liferay.portal.servlet.filters.authverifier.AuthVerifierFilter;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-payment-method-mercanet/build.gradle b/modules/apps/commerce/commerce-payment-method-mercanet/build.gradle
index cb267ee32aaafa..bab9ce116b0b48 100644
--- a/modules/apps/commerce/commerce-payment-method-mercanet/build.gradle
+++ b/modules/apps/commerce/commerce-payment-method-mercanet/build.gradle
@@ -6,12 +6,12 @@ dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
compileOnly group: "commons-codec", name: "commons-codec", version: "1.15"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.apache.httpcomponents", name: "httpclient", version: "4.5.13"
compileOnly group: "org.apache.httpcomponents", name: "httpcore", version: "4.4.14"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/MercanetCommercePaymentRequest.java b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/MercanetCommercePaymentRequest.java
index ff44a3f43856d8..f4a4a8c2d33124 100644
--- a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/MercanetCommercePaymentRequest.java
+++ b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/MercanetCommercePaymentRequest.java
@@ -7,12 +7,12 @@
import com.liferay.commerce.payment.request.CommercePaymentRequest;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Luca Pellizzon
*/
diff --git a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/MercanetCommercePaymentRequestProvider.java b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/MercanetCommercePaymentRequestProvider.java
index 585fc294f96989..917691c213d1d6 100644
--- a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/MercanetCommercePaymentRequestProvider.java
+++ b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/MercanetCommercePaymentRequestProvider.java
@@ -11,9 +11,9 @@
import com.liferay.commerce.service.CommerceOrderLocalService;
import com.liferay.portal.kernel.exception.PortalException;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/frontend/taglib/servlet/taglib/MercanetCommercePaymentMethodConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/frontend/taglib/servlet/taglib/MercanetCommercePaymentMethodConfigurationScreenNavigationEntry.java
index 9145a51d64374a..0af8b868d6c1e2 100644
--- a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/frontend/taglib/servlet/taglib/MercanetCommercePaymentMethodConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/frontend/taglib/servlet/taglib/MercanetCommercePaymentMethodConfigurationScreenNavigationEntry.java
@@ -21,15 +21,15 @@
import com.liferay.portal.kernel.settings.ParameterMapSettingsLocator;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
import java.util.Objects;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/portlet/action/EditMercanetCommercePaymentMethodConfigurationMVCActionCommand.java b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/portlet/action/EditMercanetCommercePaymentMethodConfigurationMVCActionCommand.java
index b0e57cea092cfa..b1a94c507cd822 100644
--- a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/portlet/action/EditMercanetCommercePaymentMethodConfigurationMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/portlet/action/EditMercanetCommercePaymentMethodConfigurationMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
"mvc.command.name=/commerce_payment_methods/edit_mercanet_commerce_payment_method_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/MercanetServlet.java b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/MercanetServlet.java
index 938c3cb762660f..1fb2ed9c3d4768 100644
--- a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/MercanetServlet.java
+++ b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/MercanetServlet.java
@@ -34,6 +34,14 @@
import com.worldline.sips.model.ResponseCode;
import com.worldline.sips.model.ResponseData;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.net.URL;
@@ -42,14 +50,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/filter/CommercePaymentMethodMercanetAuthVerifierFilter.java b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/filter/CommercePaymentMethodMercanetAuthVerifierFilter.java
index ae5fa0b7a4874d..1c489cbbc43e99 100644
--- a/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/filter/CommercePaymentMethodMercanetAuthVerifierFilter.java
+++ b/modules/apps/commerce/commerce-payment-method-mercanet/src/main/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/filter/CommercePaymentMethodMercanetAuthVerifierFilter.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.payment.method.mercanet.internal.constants.MercanetCommercePaymentMethodConstants;
import com.liferay.portal.servlet.filters.authverifier.AuthVerifierFilter;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-payment-method-money-order/build.gradle b/modules/apps/commerce/commerce-payment-method-money-order/build.gradle
index 4d263f261d6c82..7779d940c7755a 100644
--- a/modules/apps/commerce/commerce-payment-method-money-order/build.gradle
+++ b/modules/apps/commerce/commerce-payment-method-money-order/build.gradle
@@ -1,9 +1,9 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-frontend-taglib")
diff --git a/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/display/context/MoneyOrderCheckoutStepDisplayContext.java b/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/display/context/MoneyOrderCheckoutStepDisplayContext.java
index 9efade5e9506f1..ff738fc1289077 100644
--- a/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/display/context/MoneyOrderCheckoutStepDisplayContext.java
+++ b/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/display/context/MoneyOrderCheckoutStepDisplayContext.java
@@ -16,7 +16,7 @@
import com.liferay.portal.kernel.util.LocalizationUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/frontend/taglib/servlet/taglib/MoneyOrderCommercePaymentEngineMethodConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/frontend/taglib/servlet/taglib/MoneyOrderCommercePaymentEngineMethodConfigurationScreenNavigationEntry.java
index a256f4be159226..c174d5d6b572e5 100644
--- a/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/frontend/taglib/servlet/taglib/MoneyOrderCommercePaymentEngineMethodConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/frontend/taglib/servlet/taglib/MoneyOrderCommercePaymentEngineMethodConfigurationScreenNavigationEntry.java
@@ -22,14 +22,14 @@
import com.liferay.portal.kernel.settings.ParameterMapSettingsLocator;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/portlet/action/EditMoneyOrderCommercePaymentMethodConfigurationMVCActionCommand.java b/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/portlet/action/EditMoneyOrderCommercePaymentMethodConfigurationMVCActionCommand.java
index ac7f370b34a7ce..1f74b88aa2ee06 100644
--- a/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/portlet/action/EditMoneyOrderCommercePaymentMethodConfigurationMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/portlet/action/EditMoneyOrderCommercePaymentMethodConfigurationMVCActionCommand.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.PropertiesParamUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.HashMap;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
"mvc.command.name=/commerce_payment_methods/edit_money_order_commerce_payment_method_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/util/MoneyOrderCommerceCheckoutStep.java b/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/util/MoneyOrderCommerceCheckoutStep.java
index 1f34e79a8d67dc..4112771589e373 100644
--- a/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/util/MoneyOrderCommerceCheckoutStep.java
+++ b/modules/apps/commerce/commerce-payment-method-money-order/src/main/java/com/liferay/commerce/payment/method/money/order/internal/util/MoneyOrderCommerceCheckoutStep.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-money-order/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-payment-method-money-order/src/main/resources/META-INF/resources/init.jsp
index 8e19cc1f468795..84134b2dfc2d5f 100644
--- a/modules/apps/commerce/commerce-payment-method-money-order/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-payment-method-money-order/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/build.gradle b/modules/apps/commerce/commerce-payment-method-paypal/build.gradle
index 55840e3d0dc1b9..bad4c5e3f99550 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/build.gradle
+++ b/modules/apps/commerce/commerce-payment-method-paypal/build.gradle
@@ -6,11 +6,11 @@ dependencies {
compileInclude group: "org.json", name: "json", version: "20231013"
compileOnly group: "com.google.code.gson", name: "gson", version: "2.9.0"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/PayPalCommercePaymentIntegration.java b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/PayPalCommercePaymentIntegration.java
index 6f593950ac7280..fe16fa2e4631c1 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/PayPalCommercePaymentIntegration.java
+++ b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/PayPalCommercePaymentIntegration.java
@@ -73,6 +73,8 @@
import com.paypal.payments.Refund;
import com.paypal.payments.RefundRequest;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.math.BigDecimal;
@@ -85,8 +87,6 @@
import java.util.Objects;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/PayPalCommercePaymentRequestProvider.java b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/PayPalCommercePaymentRequestProvider.java
index ec479e5a92b19a..06ca605350c26f 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/PayPalCommercePaymentRequestProvider.java
+++ b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/PayPalCommercePaymentRequestProvider.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/frontend/taglib/servlet/taglib/PayPalCommercePaymentIntegrationConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/frontend/taglib/servlet/taglib/PayPalCommercePaymentIntegrationConfigurationScreenNavigationEntry.java
index f6edecdb707d8d..e931dda7f2bf6c 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/frontend/taglib/servlet/taglib/PayPalCommercePaymentIntegrationConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/frontend/taglib/servlet/taglib/PayPalCommercePaymentIntegrationConfigurationScreenNavigationEntry.java
@@ -21,14 +21,14 @@
import com.liferay.portal.kernel.settings.ParameterMapSettingsLocator;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/frontend/taglib/servlet/taglib/PayPalCommercePaymentMethodConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/frontend/taglib/servlet/taglib/PayPalCommercePaymentMethodConfigurationScreenNavigationEntry.java
index 9a3c0e5b659f46..941598ee55987a 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/frontend/taglib/servlet/taglib/PayPalCommercePaymentMethodConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/frontend/taglib/servlet/taglib/PayPalCommercePaymentMethodConfigurationScreenNavigationEntry.java
@@ -21,14 +21,14 @@
import com.liferay.portal.kernel.settings.ParameterMapSettingsLocator;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/portlet/action/EditPayPalCommercePaymentIntegrationConfigurationMVCActionCommand.java b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/portlet/action/EditPayPalCommercePaymentIntegrationConfigurationMVCActionCommand.java
index c6a0191b04dcf9..2aa0dc149acae4 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/portlet/action/EditPayPalCommercePaymentIntegrationConfigurationMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/portlet/action/EditPayPalCommercePaymentIntegrationConfigurationMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
"mvc.command.name=/commerce_payment_integrations/edit_paypal_commerce_payment_integration_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/portlet/action/EditPayPalCommercePaymentMethodConfigurationMVCActionCommand.java b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/portlet/action/EditPayPalCommercePaymentMethodConfigurationMVCActionCommand.java
index 449baef718c2df..721309defc8bc8 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/portlet/action/EditPayPalCommercePaymentMethodConfigurationMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/portlet/action/EditPayPalCommercePaymentMethodConfigurationMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
"mvc.command.name=/commerce_payment_methods/edit_paypal_commerce_payment_method_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/servlet/CommercePaymentMethodPayPalServlet.java b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/servlet/CommercePaymentMethodPayPalServlet.java
index 9e14bef41fa1ff..518547563bf6f9 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/servlet/CommercePaymentMethodPayPalServlet.java
+++ b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/servlet/CommercePaymentMethodPayPalServlet.java
@@ -16,18 +16,18 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.net.URL;
import java.util.Objects;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/servlet/filter/CommercePaymentMethodPayPalAuthVerifierFilter.java b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/servlet/filter/CommercePaymentMethodPayPalAuthVerifierFilter.java
index 98915a298bf911..b7222e2c4a7693 100644
--- a/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/servlet/filter/CommercePaymentMethodPayPalAuthVerifierFilter.java
+++ b/modules/apps/commerce/commerce-payment-method-paypal/src/main/java/com/liferay/commerce/payment/method/paypal/internal/servlet/filter/CommercePaymentMethodPayPalAuthVerifierFilter.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.payment.method.paypal.internal.constants.PayPalCommercePaymentMethodConstants;
import com.liferay.portal.servlet.filters.authverifier.AuthVerifierFilter;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-payment-service/build.gradle b/modules/apps/commerce/commerce-payment-service/build.gradle
index c18b2a4d9b3c3a..9dbae00005d7da 100644
--- a/modules/apps/commerce/commerce-payment-service/build.gradle
+++ b/modules/apps/commerce/commerce-payment-service/build.gradle
@@ -5,12 +5,12 @@ buildService {
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.persistence", name: "javax.persistence-api", version: "2.2"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.persistence", name: "jakarta.persistence-api", version: "3.1.0"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/engine/CommercePaymentEngineImpl.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/engine/CommercePaymentEngineImpl.java
index f3f830ca269439..4b6059e821ddf0 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/engine/CommercePaymentEngineImpl.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/engine/CommercePaymentEngineImpl.java
@@ -40,14 +40,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/engine/CommerceSubscriptionEngineImpl.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/engine/CommerceSubscriptionEngineImpl.java
index c15c3fadc052b0..60166a60f34480 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/engine/CommerceSubscriptionEngineImpl.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/engine/CommerceSubscriptionEngineImpl.java
@@ -29,9 +29,9 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Objects;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/gateway/CommercePaymentGatewayImpl.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/gateway/CommercePaymentGatewayImpl.java
index 54b638b5571eb4..4e50a2df619277 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/gateway/CommercePaymentGatewayImpl.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/gateway/CommercePaymentGatewayImpl.java
@@ -32,9 +32,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/integration/FunctionCommercePaymentIntegration.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/integration/FunctionCommercePaymentIntegration.java
index 1aad8b19b87e3c..6658f22dc37aaf 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/integration/FunctionCommercePaymentIntegration.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/integration/FunctionCommercePaymentIntegration.java
@@ -31,14 +31,14 @@
import com.liferay.portal.kernel.util.UnicodePropertiesBuilder;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/request/DefaultCommercePaymentRequestProvider.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/request/DefaultCommercePaymentRequestProvider.java
index ee04c00a95097c..bd340c54488f54 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/request/DefaultCommercePaymentRequestProvider.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/request/DefaultCommercePaymentRequestProvider.java
@@ -11,9 +11,9 @@
import com.liferay.commerce.service.CommerceOrderLocalService;
import com.liferay.portal.kernel.exception.PortalException;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/security/permission/resource/CommercePaymentEntryAuditModelResourcePermission.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/security/permission/resource/CommercePaymentEntryAuditModelResourcePermission.java
index 9faaed914e19b0..c5d0131c53c368 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/security/permission/resource/CommercePaymentEntryAuditModelResourcePermission.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/security/permission/resource/CommercePaymentEntryAuditModelResourcePermission.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/servlet/CommercePaymentServlet.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/servlet/CommercePaymentServlet.java
index 2c9f9d684c7b9c..e79ef69293993a 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/servlet/CommercePaymentServlet.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/servlet/CommercePaymentServlet.java
@@ -45,6 +45,13 @@
import com.liferay.portal.kernel.util.URLCodec;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.net.URL;
@@ -54,13 +61,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/servlet/filter/CommercePaymentAuthVerifierFilter.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/servlet/filter/CommercePaymentAuthVerifierFilter.java
index 7aedbac422756f..71a6e30566667d 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/servlet/filter/CommercePaymentAuthVerifierFilter.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/servlet/filter/CommercePaymentAuthVerifierFilter.java
@@ -8,7 +8,7 @@
import com.liferay.commerce.constants.CommercePaymentMethodConstants;
import com.liferay.portal.servlet.filters.authverifier.AuthVerifierFilter;
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/util/CommercePaymentHelperImpl.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/util/CommercePaymentHelperImpl.java
index 588b984c96a059..fa372af93f796c 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/util/CommercePaymentHelperImpl.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/util/CommercePaymentHelperImpl.java
@@ -32,13 +32,13 @@
import com.liferay.portal.kernel.util.URLCodec;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.security.Key;
import java.util.Collections;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/util/CommercePaymentHttpHelperImpl.java b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/util/CommercePaymentHttpHelperImpl.java
index 9268a34bd927f8..70fbcf130f0cd1 100644
--- a/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/util/CommercePaymentHttpHelperImpl.java
+++ b/modules/apps/commerce/commerce-payment-service/src/main/java/com/liferay/commerce/payment/internal/util/CommercePaymentHttpHelperImpl.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.security.Key;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.security.Key;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/engine/test/CommercePaymentEngineTest.java b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/engine/test/CommercePaymentEngineTest.java
index d1c5a1f422a6c2..e9b99482b26309 100644
--- a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/engine/test/CommercePaymentEngineTest.java
+++ b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/engine/test/CommercePaymentEngineTest.java
@@ -47,13 +47,13 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.frutilla.FrutillaRule;
import org.junit.After;
diff --git a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/internal/servlet/test/CommercePaymentServletTest.java b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/internal/servlet/test/CommercePaymentServletTest.java
index ab1528a99024fa..68cb8e8b7f2496 100644
--- a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/internal/servlet/test/CommercePaymentServletTest.java
+++ b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/internal/servlet/test/CommercePaymentServletTest.java
@@ -51,13 +51,13 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.servlet.Servlet;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.Servlet;
-
import org.frutilla.FrutillaRule;
import org.junit.After;
diff --git a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/test/CompletePaymentAuthorizeNetServletTest.java b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/test/CompletePaymentAuthorizeNetServletTest.java
index 6b0849ee35c6a3..20c8e45c4b82b8 100644
--- a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/test/CompletePaymentAuthorizeNetServletTest.java
+++ b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/authorize/net/internal/servlet/test/CompletePaymentAuthorizeNetServletTest.java
@@ -20,7 +20,7 @@
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
import com.liferay.portal.util.PortalImpl;
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
import org.junit.Assert;
import org.junit.ClassRule;
diff --git a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/test/MercanetServletTest.java b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/test/MercanetServletTest.java
index c956f4b64dc1a4..079a98fc13aa25 100644
--- a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/test/MercanetServletTest.java
+++ b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/mercanet/internal/servlet/test/MercanetServletTest.java
@@ -20,7 +20,7 @@
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
import com.liferay.portal.util.PortalImpl;
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
import org.junit.Assert;
import org.junit.ClassRule;
diff --git a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/paypal/internal/servlet/test/CommercePaymentMethodPayPalServletTest.java b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/paypal/internal/servlet/test/CommercePaymentMethodPayPalServletTest.java
index d333ed0fdafc55..9ff5517ae1b712 100644
--- a/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/paypal/internal/servlet/test/CommercePaymentMethodPayPalServletTest.java
+++ b/modules/apps/commerce/commerce-payment-test/src/testIntegration/java/com/liferay/commerce/payment/method/paypal/internal/servlet/test/CommercePaymentMethodPayPalServletTest.java
@@ -19,7 +19,7 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
import org.junit.Assert;
import org.junit.ClassRule;
diff --git a/modules/apps/commerce/commerce-payment-web/build.gradle b/modules/apps/commerce/commerce-payment-web/build.gradle
index 01af1d38dd7451..3210b6153808f7 100644
--- a/modules/apps/commerce/commerce-payment-web/build.gradle
+++ b/modules/apps/commerce/commerce-payment-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/application/list/CommercePaymentPanelApp.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/application/list/CommercePaymentPanelApp.java
index c8f08757585143..f55d7b5e8a4a41 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/application/list/CommercePaymentPanelApp.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/application/list/CommercePaymentPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT + ")"
+ target = "(jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
index d386fbb88d94a4..9011fc5b780e3c 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Crescenzo Rega
*/
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentEntryDisplayContext.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentEntryDisplayContext.java
index 9e1e16e0eaf9cd..4f22d92e1b2e47 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentEntryDisplayContext.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentEntryDisplayContext.java
@@ -42,6 +42,8 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.URLCodec;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -50,8 +52,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
* @author Crescenzo Rega
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentMethodGroupRelQualifiersDisplayContext.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentMethodGroupRelQualifiersDisplayContext.java
index 29ab2ff917ef07..253b006e203b61 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentMethodGroupRelQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentMethodGroupRelQualifiersDisplayContext.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.service.CountryService;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Riccardo Alberti
*/
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentMethodGroupRelsDisplayContext.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentMethodGroupRelsDisplayContext.java
index 6b681786d5a83a..f8de7aedcf05ed 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentMethodGroupRelsDisplayContext.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/CommercePaymentMethodGroupRelsDisplayContext.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Locale;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
*/
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/helper/CommercePaymentRequestHelper.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/helper/CommercePaymentRequestHelper.java
index 73ecf17273f89e..851da69dfacce8 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/helper/CommercePaymentRequestHelper.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/display/context/helper/CommercePaymentRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/AccountEntryDefaultCommercePaymentsDataSetFDSDataProvider.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/AccountEntryDefaultCommercePaymentsDataSetFDSDataProvider.java
index a9f0c3e7b39067..9e1610f7d4b719 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/AccountEntryDefaultCommercePaymentsDataSetFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/AccountEntryDefaultCommercePaymentsDataSetFDSDataProvider.java
@@ -25,11 +25,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/AccountEntryDefaultCommercePaymentsFDSActionProvider.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/AccountEntryDefaultCommercePaymentsFDSActionProvider.java
index a054e11f3a99fe..2c74931b7f3c65 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/AccountEntryDefaultCommercePaymentsFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/AccountEntryDefaultCommercePaymentsFDSActionProvider.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/CommercePaymentRestrictionsPageFDSDataProvider.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/CommercePaymentRestrictionsPageFDSDataProvider.java
index d6e76f3bdb5d17..343ed04266ea5a 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/CommercePaymentRestrictionsPageFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/data/set/provider/CommercePaymentRestrictionsPageFDSDataProvider.java
@@ -30,11 +30,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommerceChannelPaymentRestrictionsScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommerceChannelPaymentRestrictionsScreenNavigationEntry.java
index 3c2cac85656a2e..ffc4011bf5d7ac 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommerceChannelPaymentRestrictionsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommerceChannelPaymentRestrictionsScreenNavigationEntry.java
@@ -15,11 +15,11 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommercePaymentMethodGroupRelDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommercePaymentMethodGroupRelDetailsScreenNavigationEntry.java
index e993b85e15299f..b48b4678635ab3 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommercePaymentMethodGroupRelDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommercePaymentMethodGroupRelDetailsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommercePaymentMethodGroupRelQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommercePaymentMethodGroupRelQualifiersScreenNavigationEntry.java
index 76daee83357799..fa5676e2825eef 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommercePaymentMethodGroupRelQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/CommercePaymentMethodGroupRelQualifiersScreenNavigationEntry.java
@@ -24,10 +24,10 @@
import com.liferay.portal.kernel.service.CountryService;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/FunctionCommercePaymentIntegrationConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/FunctionCommercePaymentIntegrationConfigurationScreenNavigationEntry.java
index 6a3a43a9c6d3e1..7f3b6ff999c025 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/FunctionCommercePaymentIntegrationConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/frontend/taglib/servlet/taglib/FunctionCommercePaymentIntegrationConfigurationScreenNavigationEntry.java
@@ -21,14 +21,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentMethodPortlet.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentMethodPortlet.java
index 67646e780f5e2e..e31233ca575d5a 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentMethodPortlet.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentMethodPortlet.java
@@ -15,12 +15,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,13 +39,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Payment Methods",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/edit_commerce_payment_method.jsp",
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Payment Methods",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/edit_commerce_payment_method.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentMethodPortletProvider.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentMethodPortletProvider.java
index 948e7fe36d6cb6..cbbe51e912c898 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentMethodPortletProvider.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentMethodPortletProvider.java
@@ -12,10 +12,10 @@
import com.liferay.portal.kernel.portlet.PortletProvider;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentPortlet.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentPortlet.java
index 152bac2964a2d7..456dccf1103a94 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentPortlet.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/CommercePaymentPortlet.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,13 +45,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Payments",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Payments",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditAccountEntryDefaultCommercePaymentMethodMVCActionCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditAccountEntryDefaultCommercePaymentMethodMVCActionCommand.java
index 8762d6c0250049..094306bf741d4e 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditAccountEntryDefaultCommercePaymentMethodMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditAccountEntryDefaultCommercePaymentMethodMVCActionCommand.java
@@ -21,8 +21,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,8 +33,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_payment/edit_account_entry_default_commerce_payment_method"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditAccountEntryDefaultCommercePaymentMethodMVCRenderCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditAccountEntryDefaultCommercePaymentMethodMVCRenderCommand.java
index 0af694b55370f5..7aa091cb682f32 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditAccountEntryDefaultCommercePaymentMethodMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditAccountEntryDefaultCommercePaymentMethodMVCRenderCommand.java
@@ -16,13 +16,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,8 +33,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_payment/edit_account_entry_default_commerce_payment_method"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryExternalReferenceCodeMVCActionCommand.java
index add2adc908c4db..5ac58c4921b742 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryExternalReferenceCodeMVCActionCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCActionCommand;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
"mvc.command.name=/commerce_payment/edit_commerce_payment_entry_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryExternalReferenceCodeMVCRenderCommand.java
index 675c6c18d2280a..bc8e8734e2ba2a 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
"mvc.command.name=/commerce_payment/edit_commerce_payment_entry_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryMVCActionCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryMVCActionCommand.java
index c918063649e163..e572d66b28430a 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryMVCActionCommand.java
@@ -27,10 +27,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.math.BigDecimal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.math.BigDecimal;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
"mvc.command.name=/commerce_payment/edit_commerce_payment_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryMVCRenderCommand.java
index 3e20802b6d22df..44e15882204b50 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
"mvc.command.name=/commerce_payment/edit_commerce_payment_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryNoteMVCRenderCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryNoteMVCRenderCommand.java
index baf72dbab2960e..726cd6c178d48f 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryNoteMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentEntryNoteMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_PAYMENT,
"mvc.command.name=/commerce_payment/edit_commerce_payment_entry_note"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelAddressRestrictionMVCActionCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelAddressRestrictionMVCActionCommand.java
index b59a6d6bab9468..e8a5de7c763b62 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelAddressRestrictionMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelAddressRestrictionMVCActionCommand.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.List;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_payment_method_group_rel_address_restriction"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelMVCActionCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelMVCActionCommand.java
index 8c9cc408b53362..278ca8e6a371e1 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelMVCActionCommand.java
@@ -23,15 +23,15 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.io.File;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,7 +41,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
"mvc.command.name=/commerce_payment_methods/edit_commerce_payment_method_group_rel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelQualifiersMVCActionCommand.java
index 104d40e733d4c8..3e916a6c478a1b 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditCommercePaymentMethodGroupRelQualifiersMVCActionCommand.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
"mvc.command.name=/commerce_payment_methods/edit_commerce_payment_method_group_rel_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditFunctionCommercePaymentIntegrationConfigurationMVCActionCommand.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditFunctionCommercePaymentIntegrationConfigurationMVCActionCommand.java
index 3b52d86df08b25..0bc663c162d718 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditFunctionCommercePaymentIntegrationConfigurationMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/portlet/action/EditFunctionCommercePaymentIntegrationConfigurationMVCActionCommand.java
@@ -15,8 +15,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_PAYMENT_METHODS,
"mvc.command.name=/commerce_payment/edit_function_commerce_payment_integration_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/servlet/taglib/DefaultCommercePaymentMethodsJSPDynamicInclude.java b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/servlet/taglib/DefaultCommercePaymentMethodsJSPDynamicInclude.java
index dfef31d2c4c770..cee2a34ffe40e0 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/servlet/taglib/DefaultCommercePaymentMethodsJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-payment-web/src/main/java/com/liferay/commerce/payment/web/internal/servlet/taglib/DefaultCommercePaymentMethodsJSPDynamicInclude.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-payment-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-payment-web/src/main/resources/META-INF/resources/init.jsp
index 665833766cb489..860fcc51484516 100644
--- a/modules/apps/commerce/commerce-payment-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-payment-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-price-list-api/build.gradle b/modules/apps/commerce/commerce-price-list-api/build.gradle
index e1de91bd045bd1..12f812c90436ed 100644
--- a/modules/apps/commerce/commerce-price-list-api/build.gradle
+++ b/modules/apps/commerce/commerce-price-list-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-price-list-api/src/main/java/com/liferay/commerce/price/list/display/context/BaseCommercePriceListDisplayContext.java b/modules/apps/commerce/commerce-price-list-api/src/main/java/com/liferay/commerce/price/list/display/context/BaseCommercePriceListDisplayContext.java
index 53b6cb8cf88ab6..f0e949afb8a0dc 100644
--- a/modules/apps/commerce/commerce-price-list-api/src/main/java/com/liferay/commerce/price/list/display/context/BaseCommercePriceListDisplayContext.java
+++ b/modules/apps/commerce/commerce-price-list-api/src/main/java/com/liferay/commerce/price/list/display/context/BaseCommercePriceListDisplayContext.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-price-list-api/src/main/java/com/liferay/commerce/price/list/portlet/action/CommercePriceListActionHelper.java b/modules/apps/commerce/commerce-price-list-api/src/main/java/com/liferay/commerce/price/list/portlet/action/CommercePriceListActionHelper.java
index 593fda8b3c77ae..314ce1a8ead6b3 100644
--- a/modules/apps/commerce/commerce-price-list-api/src/main/java/com/liferay/commerce/price/list/portlet/action/CommercePriceListActionHelper.java
+++ b/modules/apps/commerce/commerce-price-list-api/src/main/java/com/liferay/commerce/price/list/portlet/action/CommercePriceListActionHelper.java
@@ -10,10 +10,10 @@
import com.liferay.commerce.price.list.model.CommerceTierPriceEntry;
import com.liferay.portal.kernel.exception.PortalException;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-price-list-service/build.gradle b/modules/apps/commerce/commerce-price-list-service/build.gradle
index 70254a652158e2..f7e7af5e7c6bb2 100644
--- a/modules/apps/commerce/commerce-price-list-service/build.gradle
+++ b/modules/apps/commerce/commerce-price-list-service/build.gradle
@@ -4,10 +4,10 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/portlet/action/CommercePriceListActionHelperImpl.java b/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/portlet/action/CommercePriceListActionHelperImpl.java
index 34f037f9305545..976306e29d725b 100644
--- a/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/portlet/action/CommercePriceListActionHelperImpl.java
+++ b/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/portlet/action/CommercePriceListActionHelperImpl.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommercePriceEntryIndexer.java b/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommercePriceEntryIndexer.java
index 4b8b4d82349edc..109c6df1ce4930 100644
--- a/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommercePriceEntryIndexer.java
+++ b/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommercePriceEntryIndexer.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.LinkedHashMap;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommercePriceListIndexer.java b/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommercePriceListIndexer.java
index 978cc7f68fdff9..441ab82d999918 100644
--- a/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommercePriceListIndexer.java
+++ b/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommercePriceListIndexer.java
@@ -43,14 +43,14 @@
import com.liferay.portal.search.filter.FilterBuilders;
import com.liferay.portal.search.filter.TermsSetFilterBuilder;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommerceTierPriceEntryIndexer.java b/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommerceTierPriceEntryIndexer.java
index 4b917fd1a115a3..82cbb25892b4a6 100644
--- a/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommerceTierPriceEntryIndexer.java
+++ b/modules/apps/commerce/commerce-price-list-service/src/main/java/com/liferay/commerce/price/list/internal/search/CommerceTierPriceEntryIndexer.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.LinkedHashMap;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-api/build.gradle b/modules/apps/commerce/commerce-pricing-api/build.gradle
index 362f1d940ea7ef..dac8bc2f607528 100644
--- a/modules/apps/commerce/commerce-pricing-api/build.gradle
+++ b/modules/apps/commerce/commerce-pricing-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-pricing-service/build.gradle b/modules/apps/commerce/commerce-pricing-service/build.gradle
index 7abf518c17447d..a0b01138477db8 100644
--- a/modules/apps/commerce/commerce-pricing-service/build.gradle
+++ b/modules/apps/commerce/commerce-pricing-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:change-tracking:change-tracking-spi")
diff --git a/modules/apps/commerce/commerce-pricing-service/src/main/java/com/liferay/commerce/pricing/internal/search/CommercePricingClassIndexer.java b/modules/apps/commerce/commerce-pricing-service/src/main/java/com/liferay/commerce/pricing/internal/search/CommercePricingClassIndexer.java
index abfd3fdbdfce25..11254988d0c441 100644
--- a/modules/apps/commerce/commerce-pricing-service/src/main/java/com/liferay/commerce/pricing/internal/search/CommercePricingClassIndexer.java
+++ b/modules/apps/commerce/commerce-pricing-service/src/main/java/com/liferay/commerce/pricing/internal/search/CommercePricingClassIndexer.java
@@ -22,10 +22,10 @@
import com.liferay.portal.kernel.search.filter.BooleanFilter;
import com.liferay.portal.kernel.util.GetterUtil;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-test/build.gradle b/modules/apps/commerce/commerce-pricing-test/build.gradle
index e64fc80f487547..7c5634e7433036 100644
--- a/modules/apps/commerce/commerce-pricing-test/build.gradle
+++ b/modules/apps/commerce/commerce-pricing-test/build.gradle
@@ -1,6 +1,6 @@
dependencies {
testIntegrationImplementation group: "com.github.ignaciotcrespo", name: "frutilla", version: "0.7.1"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation project(":apps:asset:asset-test-util")
testIntegrationImplementation project(":apps:change-tracking:change-tracking-test-util")
testIntegrationImplementation project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-pricing-web/build.gradle b/modules/apps/commerce/commerce-pricing-web/build.gradle
index 0e17710d2a673f..cae807e3fc3a5c 100644
--- a/modules/apps/commerce/commerce-pricing-web/build.gradle
+++ b/modules/apps/commerce/commerce-pricing-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/AddedAllCommerceDiscountRuleTypeJSPContributor.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/AddedAllCommerceDiscountRuleTypeJSPContributor.java
index 884d26daf72b1b..bfe63639c6bf8d 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/AddedAllCommerceDiscountRuleTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/AddedAllCommerceDiscountRuleTypeJSPContributor.java
@@ -11,9 +11,9 @@
import com.liferay.commerce.pricing.web.internal.display.context.AddedAllCommerceDiscountRuleDisplayContext;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/AddedAnyCommerceDiscountRuleTypeJSPContributor.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/AddedAnyCommerceDiscountRuleTypeJSPContributor.java
index 136a96d422b00d..0f180b30e6ec47 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/AddedAnyCommerceDiscountRuleTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/AddedAnyCommerceDiscountRuleTypeJSPContributor.java
@@ -11,9 +11,9 @@
import com.liferay.commerce.pricing.web.internal.display.context.AddedAnyCommerceDiscountRuleDisplayContext;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/CartTotalCommerceDiscountRuleTypeJSPContributor.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/CartTotalCommerceDiscountRuleTypeJSPContributor.java
index ee438154aa442d..3771f949322abe 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/CartTotalCommerceDiscountRuleTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/CartTotalCommerceDiscountRuleTypeJSPContributor.java
@@ -12,9 +12,9 @@
import com.liferay.commerce.pricing.web.internal.display.context.CartTotalCommerceDiscountRuleDisplayContext;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommerceDiscountPanelApp.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommerceDiscountPanelApp.java
index 76eedb3294bfcb..f94e3bc9e1229a 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommerceDiscountPanelApp.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommerceDiscountPanelApp.java
@@ -74,7 +74,7 @@ public boolean isShow(PermissionChecker permissionChecker, Group group)
private ConfigurationProvider _configurationProvider;
@Reference(
- target = "(javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT + ")"
+ target = "(jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePriceListPanelApp.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePriceListPanelApp.java
index d8fb9ffe697606..afe8faf2d2c747 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePriceListPanelApp.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePriceListPanelApp.java
@@ -75,7 +75,7 @@ public boolean isShow(PermissionChecker permissionChecker, Group group)
private ConfigurationProvider _configurationProvider;
@Reference(
- target = "(javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST + ")"
+ target = "(jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePricingClassPanelApp.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePricingClassPanelApp.java
index bf91f64d4e2c8e..ddc49db778daf3 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePricingClassPanelApp.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePricingClassPanelApp.java
@@ -38,7 +38,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES + ")"
+ target = "(jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePromotionPanelApp.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePromotionPanelApp.java
index 4da9d64d900e66..03c6417647898f 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePromotionPanelApp.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/application/list/CommercePromotionPanelApp.java
@@ -75,7 +75,7 @@ public boolean isShow(PermissionChecker permissionChecker, Group group)
private ConfigurationProvider _configurationProvider;
@Reference(
- target = "(javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION + ")"
+ target = "(jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommerceDiscountCustomAttributesDisplay.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommerceDiscountCustomAttributesDisplay.java
index 6d09081b729b8e..114dfd2cec9f37 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommerceDiscountCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommerceDiscountCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Riccardo Alberti
*/
@Component(
- property = "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ property = "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
service = CustomAttributesDisplay.class
)
public class CommerceDiscountCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePriceListCustomAttributesDisplay.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePriceListCustomAttributesDisplay.java
index ef406493e3a48b..9e2e517fc9f285 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePriceListCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePriceListCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Riccardo Alberti
*/
@Component(
- property = "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ property = "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
service = CustomAttributesDisplay.class
)
public class CommercePriceListCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePriceModifierCustomAttributesDisplay.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePriceModifierCustomAttributesDisplay.java
index 56cecee6d0a831..c3575cf673baee 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePriceModifierCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePriceModifierCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Riccardo Alberti
*/
@Component(
- property = "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ property = "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
service = CustomAttributesDisplay.class
)
public class CommercePriceModifierCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePricingClassCustomAttributesDisplay.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePricingClassCustomAttributesDisplay.java
index d0e82677dba1a9..749b57f7836b19 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePricingClassCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/custom/attributes/CommercePricingClassCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Riccardo Alberti
*/
@Component(
- property = "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
+ property = "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
service = CustomAttributesDisplay.class
)
public class CommercePricingClassCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/AddedAllCommerceDiscountRuleDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/AddedAllCommerceDiscountRuleDisplayContext.java
index 1cd653f174f1d1..80d9c2f24d453f 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/AddedAllCommerceDiscountRuleDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/AddedAllCommerceDiscountRuleDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/AddedAnyCommerceDiscountRuleDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/AddedAnyCommerceDiscountRuleDisplayContext.java
index 82bf714d35071a..eaf6061faf01a2 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/AddedAnyCommerceDiscountRuleDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/AddedAnyCommerceDiscountRuleDisplayContext.java
@@ -10,7 +10,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/BaseCommercePriceListDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/BaseCommercePriceListDisplayContext.java
index 188299c2ca3764..0cb20c3c4418c4 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/BaseCommercePriceListDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/BaseCommercePriceListDisplayContext.java
@@ -21,11 +21,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/BasePricingDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/BasePricingDisplayContext.java
index 2e31a60ccb569b..f4af896677de52 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/BasePricingDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/BasePricingDisplayContext.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.portlet.PortalPreferences;
import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPDefinitionPricingClassDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPDefinitionPricingClassDisplayContext.java
index 547f3d09e195e9..b7eb3ca838ec2f 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPDefinitionPricingClassDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPDefinitionPricingClassDisplayContext.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPInstanceCommercePriceEntryDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPInstanceCommercePriceEntryDisplayContext.java
index 1a68ce391e3812..de6cea2c156dc1 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPInstanceCommercePriceEntryDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPInstanceCommercePriceEntryDisplayContext.java
@@ -45,6 +45,10 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -53,10 +57,6 @@
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPInstanceCommerceTierPriceEntryDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPInstanceCommerceTierPriceEntryDisplayContext.java
index 5709ebee6cde56..8ba24f9faa988b 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPInstanceCommerceTierPriceEntryDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CPInstanceCommerceTierPriceEntryDisplayContext.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CartTotalCommerceDiscountRuleDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CartTotalCommerceDiscountRuleDisplayContext.java
index 5ec5423d2aa9aa..f3ae68bbcbdb90 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CartTotalCommerceDiscountRuleDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CartTotalCommerceDiscountRuleDisplayContext.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.math.BigDecimal;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
index 7ce81a7ce23e1d..f3895862daf888 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
@@ -34,11 +34,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountDisplayContext.java
index 6100854436b9c7..68e0c758200e86 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountDisplayContext.java
@@ -47,6 +47,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.taglib.util.CustomAttributesUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
@@ -54,13 +61,6 @@
import java.util.Locale;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountQualifiersDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountQualifiersDisplayContext.java
index 69c57cf05188f3..df93b4564b0f00 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountQualifiersDisplayContext.java
@@ -31,11 +31,11 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountRuleDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountRuleDisplayContext.java
index c4be6ae9360e4d..406b0ab0e11cbf 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountRuleDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceDiscountRuleDisplayContext.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceEntryDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceEntryDisplayContext.java
index 651024018b7f3a..682ce08d99eb41 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceEntryDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceEntryDisplayContext.java
@@ -32,15 +32,15 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceListDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceListDisplayContext.java
index 205d27e313553c..01b82a43b5c828 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceListDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceListDisplayContext.java
@@ -41,14 +41,14 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceListQualifiersDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceListQualifiersDisplayContext.java
index 385d16a7a2049c..856ce258ca401f 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceListQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePriceListQualifiersDisplayContext.java
@@ -25,11 +25,11 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassCPDefinitionDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassCPDefinitionDisplayContext.java
index ca5331938157b8..339758b357c6b3 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassCPDefinitionDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassCPDefinitionDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassDiscountDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassDiscountDisplayContext.java
index 9236a0d5f3c017..d67407fb328c93 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassDiscountDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassDiscountDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassDisplayContext.java
index 3430050a8f1e03..1a7072707288e2 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassDisplayContext.java
@@ -23,15 +23,15 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.RenderURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-import javax.portlet.RenderURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassPriceListDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassPriceListDisplayContext.java
index 6f9865770862f6..ace3c7fa18252f 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassPriceListDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommercePricingClassPriceListDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceTierCommercePriceEntryDisplayContext.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceTierCommercePriceEntryDisplayContext.java
index 81e753b7367779..0cc9301dae36d6 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceTierCommercePriceEntryDisplayContext.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/CommerceTierCommercePriceEntryDisplayContext.java
@@ -28,7 +28,7 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/helper/CommercePricingRequestHelper.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/helper/CommercePricingRequestHelper.java
index e486e3f070b8e1..f0152279859df8 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/helper/CommercePricingRequestHelper.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/display/context/helper/CommercePricingRequestHelper.java
@@ -8,10 +8,10 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.JavaConstants;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Riccardo Alberti
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstancePriceEntryFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstancePriceEntryFDSActionProvider.java
index 44ed5127bf33df..0158b4e9eb872c 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstancePriceEntryFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstancePriceEntryFDSActionProvider.java
@@ -31,13 +31,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstancePriceEntryFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstancePriceEntryFDSDataProvider.java
index 8a505802f0ed72..347e7e8c5bbffd 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstancePriceEntryFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstancePriceEntryFDSDataProvider.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstanceTierPriceEntryFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstanceTierPriceEntryFDSActionProvider.java
index 0d8339d153751b..8374c8887a8685 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstanceTierPriceEntryFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstanceTierPriceEntryFDSActionProvider.java
@@ -33,13 +33,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstanceTierPriceEntryFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstanceTierPriceEntryFDSDataProvider.java
index f749954969dfc0..bb55ec15632576 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstanceTierPriceEntryFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CPInstanceTierPriceEntryFDSDataProvider.java
@@ -32,14 +32,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.Date;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceDiscountRuleCPDefinitionFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceDiscountRuleCPDefinitionFDSActionProvider.java
index 7f8eb5344ae60d..150096aff8770d 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceDiscountRuleCPDefinitionFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceDiscountRuleCPDefinitionFDSActionProvider.java
@@ -26,14 +26,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceDiscountRuleCPDefinitionFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceDiscountRuleCPDefinitionFDSDataProvider.java
index 945d678d25ff49..1162ca4ca132f7 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceDiscountRuleCPDefinitionFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceDiscountRuleCPDefinitionFDSDataProvider.java
@@ -27,13 +27,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePriceModifierFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePriceModifierFDSActionProvider.java
index 8b141f216b6a10..1029d42db79fcd 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePriceModifierFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePriceModifierFDSActionProvider.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePriceModifierFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePriceModifierFDSDataProvider.java
index 1fba34ede3b98f..7de7085d41876b 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePriceModifierFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePriceModifierFDSDataProvider.java
@@ -23,14 +23,14 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassCPDefinitionRelFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassCPDefinitionRelFDSActionProvider.java
index 0ef4156f610fb9..3da41908c76459 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassCPDefinitionRelFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassCPDefinitionRelFDSActionProvider.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassCPDefinitionRelFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassCPDefinitionRelFDSDataProvider.java
index 9e826612bbeef9..a7bb4c084e629e 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassCPDefinitionRelFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassCPDefinitionRelFDSDataProvider.java
@@ -28,12 +28,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassDiscountFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassDiscountFDSActionProvider.java
index f5ee3f2fa15abe..e6d5e4cafb736f 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassDiscountFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassDiscountFDSActionProvider.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassDiscountFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassDiscountFDSDataProvider.java
index 8339d1722d8c53..0f0bfb8cf2d929 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassDiscountFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassDiscountFDSDataProvider.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassFDSActionProvider.java
index 294f007b45460a..6da30588a80562 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassFDSActionProvider.java
@@ -24,14 +24,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassFDSDataProvider.java
index 7c46584d5d8fe2..fe3f1941b5df98 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassFDSDataProvider.java
@@ -23,13 +23,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassPriceListFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassPriceListFDSActionProvider.java
index 7ab4fe8d8e8a6c..f4ba9c851d7223 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassPriceListFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassPriceListFDSActionProvider.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassPriceListFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassPriceListFDSDataProvider.java
index bf6dc9c50cf091..a103877492b339 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassPriceListFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommercePricingClassPriceListFDSDataProvider.java
@@ -26,13 +26,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceProductPricingClassFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceProductPricingClassFDSActionProvider.java
index 9966da4f6eed2c..eb3cd42d165962 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceProductPricingClassFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceProductPricingClassFDSActionProvider.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
-import java.util.List;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceProductPricingClassFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceProductPricingClassFDSDataProvider.java
index 905b9c75f0cb31..e9d7ff4a2de041 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceProductPricingClassFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceProductPricingClassFDSDataProvider.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceTierPriceEntryFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceTierPriceEntryFDSActionProvider.java
index f3efd1841a43b2..237093875cb1cd 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceTierPriceEntryFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceTierPriceEntryFDSActionProvider.java
@@ -30,13 +30,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceTierPriceEntryFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceTierPriceEntryFDSDataProvider.java
index d79c388d54e563..959335c95ed6f3 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceTierPriceEntryFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/CommerceTierPriceEntryFDSDataProvider.java
@@ -32,14 +32,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/DiscountPricingEntryCommerceChannelAccountEntryRelFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/DiscountPricingEntryCommerceChannelAccountEntryRelFDSDataProvider.java
index de6d107d65416f..887f95f58636e4 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/DiscountPricingEntryCommerceChannelAccountEntryRelFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/DiscountPricingEntryCommerceChannelAccountEntryRelFDSDataProvider.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/PriceListPricingEntryCommerceChannelAccountEntryRelFDSDataProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/PriceListPricingEntryCommerceChannelAccountEntryRelFDSDataProvider.java
index 9dae114f126610..889f0dc46442b4 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/PriceListPricingEntryCommerceChannelAccountEntryRelFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/PriceListPricingEntryCommerceChannelAccountEntryRelFDSDataProvider.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/PricingEntryCommerceChannelAccountEntryRelFDSActionProvider.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/PricingEntryCommerceChannelAccountEntryRelFDSActionProvider.java
index 8a1dd9ff14cb5c..dc2474548489d2 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/PricingEntryCommerceChannelAccountEntryRelFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/data/set/provider/PricingEntryCommerceChannelAccountEntryRelFDSActionProvider.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPDefinitionPricingClassesRelationsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPDefinitionPricingClassesRelationsScreenNavigationEntry.java
index 702584bcfd06e0..4b6effefb09ea5 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPDefinitionPricingClassesRelationsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPDefinitionPricingClassesRelationsScreenNavigationEntry.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPInstancePriceEntriesScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPInstancePriceEntriesScreenNavigationEntry.java
index bc1eef9fd1eeba..2efe4e389109af 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPInstancePriceEntriesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPInstancePriceEntriesScreenNavigationEntry.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPInstancePriceListsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPInstancePriceListsScreenNavigationEntry.java
index 6bc4a748212aa8..3ed9ab65930e36 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPInstancePriceListsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CPInstancePriceListsScreenNavigationEntry.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommerceDiscountDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommerceDiscountDetailsScreenNavigationEntry.java
index 04438298bdc0ae..996c09b98baf5a 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommerceDiscountDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommerceDiscountDetailsScreenNavigationEntry.java
@@ -25,10 +25,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommerceDiscountQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommerceDiscountQualifiersScreenNavigationEntry.java
index 6bbcf03fef2c81..54d036dbbf8a0e 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommerceDiscountQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommerceDiscountQualifiersScreenNavigationEntry.java
@@ -29,10 +29,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListDetailsScreenNavigationEntry.java
index fbece94e001ae8..3732c180e7af5d 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListDetailsScreenNavigationEntry.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListEntriesScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListEntriesScreenNavigationEntry.java
index 973bf0dde2814b..6d73e5f9b4726d 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListEntriesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListEntriesScreenNavigationEntry.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListPriceModifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListPriceModifiersScreenNavigationEntry.java
index 5de28503d07aef..08141a87648fee 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListPriceModifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListPriceModifiersScreenNavigationEntry.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListQualifiersScreenNavigationEntry.java
index 8d2bf2c8180b23..2a53ab4b16501a 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceListQualifiersScreenNavigationEntry.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierCategoriesScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierCategoriesScreenNavigationEntry.java
index cb5d493d1edc3e..1a66eea0a4094d 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierCategoriesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierCategoriesScreenNavigationEntry.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierInfoScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierInfoScreenNavigationEntry.java
index f427c8825ac3d1..bb4674ee1389d4 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierInfoScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierInfoScreenNavigationEntry.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierPricingClassesScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierPricingClassesScreenNavigationEntry.java
index c80cc16673527d..f128b63274bd32 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierPricingClassesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierPricingClassesScreenNavigationEntry.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierProductsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierProductsScreenNavigationEntry.java
index 5dccf3badddbf0..df0465a77b58d6 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierProductsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePriceModifierProductsScreenNavigationEntry.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassDetailsScreenNavigationEntry.java
index abfd8019524343..44be6821e3d062 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassDetailsScreenNavigationEntry.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassDiscountsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassDiscountsScreenNavigationEntry.java
index f5781a101bedee..05a60c43af2adc 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassDiscountsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassDiscountsScreenNavigationEntry.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassPriceListsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassPriceListsScreenNavigationEntry.java
index abea63011cbefb..a9dd603be1aa47 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassPriceListsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassPriceListsScreenNavigationEntry.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassProductsScreenNavigationEntry.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassProductsScreenNavigationEntry.java
index 9060487be3a048..4e72c5c2eb0f6c 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassProductsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/frontend/taglib/servlet/taglib/CommercePricingClassProductsScreenNavigationEntry.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommerceDiscountPortlet.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommerceDiscountPortlet.java
index f87230df2d197f..198d424292743b 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommerceDiscountPortlet.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommerceDiscountPortlet.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,13 +46,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Discounts",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/commerce_discounts/view.jsp",
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Discounts",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/commerce_discounts/view.jsp",
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePriceListPortlet.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePriceListPortlet.java
index ca1a8bc439ec76..cbdb1858e05169 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePriceListPortlet.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePriceListPortlet.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,13 +44,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Price Lists",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/commerce_price_lists/view.jsp",
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Price Lists",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/commerce_price_lists/view.jsp",
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePricingClassesPortlet.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePricingClassesPortlet.java
index e13ff108097947..71324e681eb651 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePricingClassesPortlet.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePricingClassesPortlet.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,13 +38,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Groups",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/commerce_pricing_class/view.jsp",
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Groups",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/commerce_pricing_class/view.jsp",
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePromotionPortlet.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePromotionPortlet.java
index f059f164c93664..47a5c233109aab 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePromotionPortlet.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/CommercePromotionPortlet.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,13 +44,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Promotions",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/commerce_price_lists/view.jsp",
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Promotions",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/commerce_price_lists/view.jsp",
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCPInstanceCommercePriceEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCPInstanceCommercePriceEntryMVCRenderCommand.java
index 81b2b320cdfc9d..92269c727c61e6 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCPInstanceCommercePriceEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCPInstanceCommercePriceEntryMVCRenderCommand.java
@@ -20,14 +20,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/add_cp_instance_commerce_price_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceDiscountMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceDiscountMVCRenderCommand.java
index e728e2cab3407d..6eaa98813b60b6 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceDiscountMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceDiscountMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.pricing.constants.CommercePricingPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/add_commerce_discount"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceDiscountRuleMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceDiscountRuleMVCRenderCommand.java
index 616fd95e4bdb3f..7f85f38fde2e33 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceDiscountRuleMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceDiscountRuleMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.pricing.constants.CommercePricingPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/add_commerce_discount_rule"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePriceListMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePriceListMVCRenderCommand.java
index cd6dbf03c17bfb..8c940cf3673ce1 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePriceListMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePriceListMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/add_commerce_price_list"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePriceModifierMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePriceModifierMVCRenderCommand.java
index 3c95d668461b49..372f58cc1f231e 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePriceModifierMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePriceModifierMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/add_commerce_price_modifier"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePricingClassMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePricingClassMVCRenderCommand.java
index eea610d9f5fe82..c73242f171f70a 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePricingClassMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommercePricingClassMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.pricing.constants.CommercePricingPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
"mvc.command.name=/commerce_pricing_classes/add_commerce_pricing_class"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceTierPriceEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceTierPriceEntryMVCRenderCommand.java
index 1ac6b04c792591..a33184447c3c35 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceTierPriceEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/AddCommerceTierPriceEntryMVCRenderCommand.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,8 +31,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/add_commerce_tier_price_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommerceDiscountMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommerceDiscountMVCActionCommand.java
index fa389a8a3fb5ce..b303e4e6d4118b 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommerceDiscountMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommerceDiscountMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,8 +29,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_pricing/edit_account_entry_default_commerce_discount"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommerceDiscountMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommerceDiscountMVCRenderCommand.java
index 07808935dcf293..111bc550ee62b6 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommerceDiscountMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommerceDiscountMVCRenderCommand.java
@@ -20,13 +20,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,8 +38,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_pricing/edit_account_entry_default_commerce_discount"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommercePriceListMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommercePriceListMVCActionCommand.java
index 308bd939715153..ce1d438e00fede 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommercePriceListMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommercePriceListMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,8 +29,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_pricing/edit_account_entry_default_commerce_price_list"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommercePriceListMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommercePriceListMVCRenderCommand.java
index f1cc76dfbc42b3..5eb00059df1621 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommercePriceListMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditAccountEntryDefaultCommercePriceListMVCRenderCommand.java
@@ -20,13 +20,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,8 +38,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_pricing/edit_account_entry_default_commerce_price_list"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPDefinitionPricingClassMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPDefinitionPricingClassMVCActionCommand.java
index 722ffbbefcd91d..d282a115b44506 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPDefinitionPricingClassMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPDefinitionPricingClassMVCActionCommand.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_pricing_class"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPDefinitionPricingClassMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPDefinitionPricingClassMVCRenderCommand.java
index 8a7f695c29437a..e06c788dba3136 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPDefinitionPricingClassMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPDefinitionPricingClassMVCRenderCommand.java
@@ -16,14 +16,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_pricing_class"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommercePriceEntryMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommercePriceEntryMVCActionCommand.java
index fe63f72d159f89..34687fad5784ae 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommercePriceEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommercePriceEntryMVCActionCommand.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.util.Calendar;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,7 +44,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_instance_commerce_price_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommercePriceEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommercePriceEntryMVCRenderCommand.java
index 238fc4d0574ccc..7f4274211e0cc0 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommercePriceEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommercePriceEntryMVCRenderCommand.java
@@ -21,14 +21,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_instance_commerce_price_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommerceTierPriceEntryMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommerceTierPriceEntryMVCActionCommand.java
index 36a6f72a620ee7..2aece857b42753 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommerceTierPriceEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommerceTierPriceEntryMVCActionCommand.java
@@ -29,14 +29,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,7 +45,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_instance_commerce_tier_price_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommerceTierPriceEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommerceTierPriceEntryMVCRenderCommand.java
index ad3322d16d304d..3886038a0bf2b6 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommerceTierPriceEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCPInstanceCommerceTierPriceEntryMVCRenderCommand.java
@@ -18,14 +18,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_instance_commerce_tier_price_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountExternalReferenceCodeMVCActionCommand.java
index 4fe05b3d447467..e97ca2afbffee8 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountExternalReferenceCodeMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/edit_commerce_discount_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountExternalReferenceCodeMVCRenderCommand.java
index b53ed2b542ea3b..cf306c37a83c51 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.pricing.constants.CommercePricingPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/edit_commerce_discount_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountMVCActionCommand.java
index 03f9a4c1038533..ee7e144994739a 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountMVCActionCommand.java
@@ -23,14 +23,14 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/edit_commerce_discount"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountMVCRenderCommand.java
index dd49d682d0bd2f..9c47e5008ebd28 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/edit_commerce_discount"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountQualifiersMVCActionCommand.java
index 56c869c001ec58..a29f06cd4bde6f 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountQualifiersMVCActionCommand.java
@@ -16,10 +16,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/edit_commerce_discount_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountRuleMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountRuleMVCActionCommand.java
index 2a2df4a2f3cc20..5f3e1010628992 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountRuleMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountRuleMVCActionCommand.java
@@ -20,8 +20,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/edit_commerce_discount_rule"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountRuleMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountRuleMVCRenderCommand.java
index 235e18a0fe7925..613da18cc0a605 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountRuleMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceDiscountRuleMVCRenderCommand.java
@@ -14,11 +14,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_DISCOUNT,
"mvc.command.name=/commerce_discount/edit_commerce_discount_rule"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceEntryMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceEntryMVCActionCommand.java
index bcd937fd6f3b82..dd5d2e1d9a66bb 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceEntryMVCActionCommand.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.util.Calendar;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,8 +44,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceEntryMVCRenderCommand.java
index 39858fc9d202a0..235115a702c70b 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceEntryMVCRenderCommand.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,8 +32,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListExternalReferenceCodeMVCActionCommand.java
index 6bb28b17ad89bf..02c6d5207d124a 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListExternalReferenceCodeMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_list_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListExternalReferenceCodeMVCRenderCommand.java
index 0f76b8c83bfdc9..4805fe144addc9 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListExternalReferenceCodeMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_list_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListMVCActionCommand.java
index 0191160bbded3a..9310a3143b1543 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListMVCActionCommand.java
@@ -30,13 +30,13 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletURL;
+
import java.util.Calendar;
import java.util.Date;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletURL;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,8 +45,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_list"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListMVCRenderCommand.java
index 35aa29795b33e1..29e644ea795e85 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListMVCRenderCommand.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,8 +34,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_list"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListQualifiersMVCActionCommand.java
index 5762bad0ee4fe6..88508bdffcfd07 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceListQualifiersMVCActionCommand.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,8 +28,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_list_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceModifierMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceModifierMVCActionCommand.java
index d147f6f80216b5..065c9d3ecfcfeb 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceModifierMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceModifierMVCActionCommand.java
@@ -24,14 +24,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,8 +40,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_modifier"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceModifierMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceModifierMVCRenderCommand.java
index 789a8377d1a3f5..adc6898f644cfb 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceModifierMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePriceModifierMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_price_modifier"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassExternalReferenceCodeMVCActionCommand.java
index 8b1bbb777cbad9..b3774f228daafc 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassExternalReferenceCodeMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
"mvc.command.name=/commerce_pricing_classes/edit_commerce_pricing_class_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassExternalReferenceCodeMVCRenderCommand.java
index 2e1113efeef298..ecf3e752abf0d8 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.pricing.constants.CommercePricingPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
"mvc.command.name=/commerce_pricing_classes/edit_commerce_pricing_class_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassMVCActionCommand.java
index 144e1c5f9e4696..cad7199697ec66 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassMVCActionCommand.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
"mvc.command.name=/commerce_pricing_classes/edit_commerce_pricing_class"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassMVCRenderCommand.java
index 221b2342971c16..cfc0fa68a9b1ce 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommercePricingClassMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.pricing.constants.CommercePricingPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICING_CLASSES,
"mvc.command.name=/commerce_pricing_classes/edit_commerce_pricing_class"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceTierPriceEntryMVCActionCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceTierPriceEntryMVCActionCommand.java
index d76887b2520d47..aec461464971b0 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceTierPriceEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceTierPriceEntryMVCActionCommand.java
@@ -34,17 +34,17 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
+
import java.math.BigDecimal;
import java.util.Calendar;
import java.util.Date;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -53,8 +53,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_tier_price_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceTierPriceEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceTierPriceEntryMVCRenderCommand.java
index 71b4420acbef7c..51157a40d6eb9c 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceTierPriceEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/portlet/action/EditCommerceTierPriceEntryMVCRenderCommand.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,8 +31,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
- "javax.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PRICE_LIST,
+ "jakarta.portlet.name=" + CommercePricingPortletKeys.COMMERCE_PROMOTION,
"mvc.command.name=/commerce_price_list/edit_commerce_tier_price_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/servlet/taglib/DefaultCommerceDiscountsJSPDynamicInclude.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/servlet/taglib/DefaultCommerceDiscountsJSPDynamicInclude.java
index 0417a6a2b95f7d..21be45248bbfb6 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/servlet/taglib/DefaultCommerceDiscountsJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/servlet/taglib/DefaultCommerceDiscountsJSPDynamicInclude.java
@@ -21,11 +21,11 @@
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/servlet/taglib/DefaultCommercePriceListsJSPDynamicInclude.java b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/servlet/taglib/DefaultCommercePriceListsJSPDynamicInclude.java
index 025f524ef07b87..26dd50934e4897 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/servlet/taglib/DefaultCommercePriceListsJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/java/com/liferay/commerce/pricing/web/internal/servlet/taglib/DefaultCommercePriceListsJSPDynamicInclude.java
@@ -21,11 +21,11 @@
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-pricing-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-pricing-web/src/main/resources/META-INF/resources/init.jsp
index a65bb1985207f2..95ffe0e06cbfe1 100644
--- a/modules/apps/commerce/commerce-pricing-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-pricing-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -113,14 +113,14 @@ page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@
page import="com.liferay.taglib.servlet.PipingServletResponseFactory" %><%@
page import="com.liferay.taglib.util.CustomAttributesUtil" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.math.BigDecimal" %>
<%@ page import="java.util.List" %><%@
page import="java.util.Locale" %><%@
page import="java.util.Objects" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-product-api/build.gradle b/modules/apps/commerce/commerce-product-api/build.gradle
index 8c50e3db1ddf52..e39618e482a3fa 100644
--- a/modules/apps/commerce/commerce-product-api/build.gradle
+++ b/modules/apps/commerce/commerce-product-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/data/source/CPDataSource.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/data/source/CPDataSource.java
index 9c8fa042f5bc85..ef40efca2a0fb9 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/data/source/CPDataSource.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/data/source/CPDataSource.java
@@ -7,9 +7,9 @@
import aQute.bnd.annotation.ProviderType;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/BaseCPDefinitionsDisplayContext.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/BaseCPDefinitionsDisplayContext.java
index 02cabb9c6995bd..ed5e0d78324e47 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/BaseCPDefinitionsDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/BaseCPDefinitionsDisplayContext.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
-import java.util.Locale;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/BaseCPDefinitionsSearchContainerDisplayContext.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/BaseCPDefinitionsSearchContainerDisplayContext.java
index b824d0b7a237cc..b4c76d2e38856a 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/BaseCPDefinitionsSearchContainerDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/BaseCPDefinitionsSearchContainerDisplayContext.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/helper/CPRequestHelper.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/helper/CPRequestHelper.java
index 12569d6c48cd8d..13dd377a11a088 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/helper/CPRequestHelper.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/helper/CPRequestHelper.java
@@ -10,10 +10,10 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.JavaConstants;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/util/CPRequestHelper.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/util/CPRequestHelper.java
index 4d0fd116ed01c8..e9f75ba7a2f5fa 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/util/CPRequestHelper.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/display/context/util/CPRequestHelper.java
@@ -10,10 +10,10 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.JavaConstants;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/option/CommerceOptionType.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/option/CommerceOptionType.java
index 9bf6af21866c28..1f524e7818d625 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/option/CommerceOptionType.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/option/CommerceOptionType.java
@@ -7,10 +7,10 @@
import com.liferay.commerce.product.model.CPDefinitionOptionRel;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/portlet/action/ActionHelper.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/portlet/action/ActionHelper.java
index 0cb1e3a8e2ed09..16fd4335c71e0b 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/portlet/action/ActionHelper.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/portlet/action/ActionHelper.java
@@ -16,13 +16,13 @@
import com.liferay.commerce.product.type.CPType;
import com.liferay.portal.kernel.exception.PortalException;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.util.List;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalService.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalService.java
index f579d65a624a5d..bbf88674064539 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalService.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalService.java
@@ -45,7 +45,7 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.annotation.versioning.ProviderType;
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalServiceUtil.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalServiceUtil.java
index 10805bcbffefc3..a6ea37b22ded5b 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalServiceUtil.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalServiceUtil.java
@@ -780,7 +780,7 @@ public static boolean isVersionable(long cpDefinitionId) {
public static boolean isVersionable(
long cpDefinitionId,
- javax.servlet.http.HttpServletRequest httpServletRequest) {
+ jakarta.servlet.http.HttpServletRequest httpServletRequest) {
return getService().isVersionable(cpDefinitionId, httpServletRequest);
}
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalServiceWrapper.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalServiceWrapper.java
index 5764fd6a59445b..8027a6426dc4b6 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalServiceWrapper.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/service/CPDefinitionLocalServiceWrapper.java
@@ -880,7 +880,7 @@ public boolean isVersionable(long cpDefinitionId) {
@Override
public boolean isVersionable(
long cpDefinitionId,
- javax.servlet.http.HttpServletRequest httpServletRequest) {
+ jakarta.servlet.http.HttpServletRequest httpServletRequest) {
return _cpDefinitionLocalService.isVersionable(
cpDefinitionId, httpServletRequest);
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/util/CPContentContributor.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/util/CPContentContributor.java
index 75c549f5fe56f8..231e5e43094b25 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/util/CPContentContributor.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/util/CPContentContributor.java
@@ -9,7 +9,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.json.JSONObject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/util/CPSubscriptionTypeJSPContributor.java b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/util/CPSubscriptionTypeJSPContributor.java
index 51fab492b2c54e..363dd221f9b5c6 100644
--- a/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/util/CPSubscriptionTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/util/CPSubscriptionTypeJSPContributor.java
@@ -7,8 +7,8 @@
import aQute.bnd.annotation.ProviderType;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/build.gradle b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/build.gradle
index 86fc6e178fc31d..47cffa1c40bf2a 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:asset:asset-taglib")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/display/context/CPAssetCategoriesNavigationDisplayContext.java b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/display/context/CPAssetCategoriesNavigationDisplayContext.java
index c98f055c5fe9d3..e9cce64635fcaf 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/display/context/CPAssetCategoriesNavigationDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/display/context/CPAssetCategoriesNavigationDisplayContext.java
@@ -42,11 +42,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
*/
diff --git a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/exportimport/portlet/preferences/processor/AssetCategoriesNavigationExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/exportimport/portlet/preferences/processor/AssetCategoriesNavigationExportImportPortletPreferencesProcessor.java
index 1f2675a0e9b3a6..a1c4e346fe781a 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/exportimport/portlet/preferences/processor/AssetCategoriesNavigationExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/exportimport/portlet/preferences/processor/AssetCategoriesNavigationExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Fabio Monaco
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_ASSET_CATEGORIES_NAVIGATION,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_ASSET_CATEGORIES_NAVIGATION,
service = ExportImportPortletPreferencesProcessor.class
)
public class AssetCategoriesNavigationExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/CPAssetCategoriesNavigationPortlet.java b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/CPAssetCategoriesNavigationPortlet.java
index 03e123f9f86321..dbfeb4133befe2 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/CPAssetCategoriesNavigationPortlet.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/CPAssetCategoriesNavigationPortlet.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,14 +46,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.restore-current-view=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Commerce Categories Navigation",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_ASSET_CATEGORIES_NAVIGATION,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Commerce Categories Navigation",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_ASSET_CATEGORIES_NAVIGATION,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/action/CPAssetCategoriesNavigationConfigurationAction.java b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/action/CPAssetCategoriesNavigationConfigurationAction.java
index dcdfe19587f030..a04c4794c5d1f1 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/action/CPAssetCategoriesNavigationConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/action/CPAssetCategoriesNavigationConfigurationAction.java
@@ -21,7 +21,7 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
* @author Marco Leo
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_ASSET_CATEGORIES_NAVIGATION,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_ASSET_CATEGORIES_NAVIGATION,
service = ConfigurationAction.class
)
public class CPAssetCategoriesNavigationConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/display/template/CPAssetCategoriesNavigationPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/display/template/CPAssetCategoriesNavigationPortletDisplayTemplateHandler.java
index 2156e1957edf2f..2fc18f6ddcab3c 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/display/template/CPAssetCategoriesNavigationPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-navigation-web/src/main/java/com/liferay/commerce/product/asset/categories/navigation/web/internal/portlet/display/template/CPAssetCategoriesNavigationPortletDisplayTemplateHandler.java
@@ -33,7 +33,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_ASSET_CATEGORIES_NAVIGATION,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_ASSET_CATEGORIES_NAVIGATION,
service = TemplateHandler.class
)
public class CPAssetCategoriesNavigationPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/build.gradle b/modules/apps/commerce/commerce-product-asset-categories-web/build.gradle
index 7a210e13bec58e..1e445dafb1bdc5 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:asset:asset-taglib")
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPAttachmentFileEntriesDisplayContext.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPAttachmentFileEntriesDisplayContext.java
index 247c1b5d8226b7..1b1891298886f3 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPAttachmentFileEntriesDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPAttachmentFileEntriesDisplayContext.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.portlet.RequestBackedPortletURLFactory;
import com.liferay.portal.kernel.portlet.RequestBackedPortletURLFactoryUtil;
-import java.util.Collections;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPAttachmentFileEntriesManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPAttachmentFileEntriesManagementToolbarDisplayContext.java
index 782e609d9ce854..069d9cb162796a 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPAttachmentFileEntriesManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPAttachmentFileEntriesManagementToolbarDisplayContext.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPDisplayLayoutDisplayContext.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPDisplayLayoutDisplayContext.java
index 5c1bfde80a53ff..ea6f3a28867171 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPDisplayLayoutDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/display/context/CategoryCPDisplayLayoutDisplayContext.java
@@ -45,14 +45,14 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/exportimport/data/handler/AssetCategoryPortletDataHandler.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/exportimport/data/handler/AssetCategoryPortletDataHandler.java
index fdad364442f450..6140ac870cd9cf 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/exportimport/data/handler/AssetCategoryPortletDataHandler.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/exportimport/data/handler/AssetCategoryPortletDataHandler.java
@@ -27,9 +27,9 @@
import com.liferay.portal.kernel.xml.Element;
import com.liferay.portal.kernel.xml.SAXReaderUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
"service.ranking:Integer=100"
},
service = PortletDataHandler.class
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/data/set/provider/CommerceCategoryDisplayPageFDSActionProvider.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/data/set/provider/CommerceCategoryDisplayPageFDSActionProvider.java
index 859aaa39081490..c62daccdab2e63 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/data/set/provider/CommerceCategoryDisplayPageFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/data/set/provider/CommerceCategoryDisplayPageFDSActionProvider.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/data/set/provider/CommerceCategoryDisplayPageFDSDataProvider.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/data/set/provider/CommerceCategoryDisplayPageFDSDataProvider.java
index f2b2d41b0548db..9de6014283630e 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/data/set/provider/CommerceCategoryDisplayPageFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/data/set/provider/CommerceCategoryDisplayPageFDSDataProvider.java
@@ -25,11 +25,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/form/navigator/CategoryCPAttachmentDetailsFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/form/navigator/CategoryCPAttachmentDetailsFormNavigatorEntry.java
index 8b5339677bed57..55253d922349f7 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/form/navigator/CategoryCPAttachmentDetailsFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/form/navigator/CategoryCPAttachmentDetailsFormNavigatorEntry.java
@@ -11,9 +11,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/form/navigator/CategoryCPAttachmentScheduleFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/form/navigator/CategoryCPAttachmentScheduleFormNavigatorEntry.java
index 41da77a54caada..b070c2d343e155 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/form/navigator/CategoryCPAttachmentScheduleFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/form/navigator/CategoryCPAttachmentScheduleFormNavigatorEntry.java
@@ -11,9 +11,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CategoryCPAttachmentScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CategoryCPAttachmentScreenNavigationEntry.java
index 3314f10da971a5..a9b1a689808290 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CategoryCPAttachmentScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CategoryCPAttachmentScreenNavigationEntry.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CategoryCPFriendlyURLScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CategoryCPFriendlyURLScreenNavigationEntry.java
index 717d14eee0ff30..90bf7bbc01c6fc 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CategoryCPFriendlyURLScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CategoryCPFriendlyURLScreenNavigationEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCategoryDisplayLayoutsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCategoryDisplayLayoutsScreenNavigationEntry.java
index 01def7bdbf8547..7779ddbee01984 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCategoryDisplayLayoutsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/frontend/taglib/servlet/taglib/CommerceChannelCategoryDisplayLayoutsScreenNavigationEntry.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.service.permission.GroupPermissionUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/DeleteAssetCategoryCPDefinitionMVCActionCommand.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/DeleteAssetCategoryCPDefinitionMVCActionCommand.java
index f07ef2c010d2b9..a9e148320309ec 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/DeleteAssetCategoryCPDefinitionMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/DeleteAssetCategoryCPDefinitionMVCActionCommand.java
@@ -14,8 +14,8 @@
import com.liferay.portal.kernel.service.ServiceContextFactory;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/commerce_product_asset_categories/delete_asset_category_cp_definition"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPAttachmentFileEntryMVCActionCommand.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPAttachmentFileEntryMVCActionCommand.java
index dca6ef71d56abb..446292ad4bd328 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPAttachmentFileEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPAttachmentFileEntryMVCActionCommand.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/commerce_product_asset_categories/edit_asset_category_cp_attachment_file_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPAttachmentFileEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPAttachmentFileEntryMVCRenderCommand.java
index a68852b7fc15bb..e73a05105b75e3 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPAttachmentFileEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPAttachmentFileEntryMVCRenderCommand.java
@@ -19,16 +19,16 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -40,7 +40,7 @@
@Component(
configurationPid = "com.liferay.commerce.product.configuration.AttachmentsConfiguration",
property = {
- "javax.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/commerce_product_asset_categories/edit_asset_category_cp_attachment_file_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPDisplayLayoutMVCActionCommand.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPDisplayLayoutMVCActionCommand.java
index 0c5eea8ba6ee9f..e3ed425480f6c3 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPDisplayLayoutMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPDisplayLayoutMVCActionCommand.java
@@ -33,12 +33,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -47,7 +47,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_asset_category_cp_display_layout"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPDisplayLayoutMVCRenderCommand.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPDisplayLayoutMVCRenderCommand.java
index cc673d2b65f48e..9a6a7402d290a4 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPDisplayLayoutMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryCPDisplayLayoutMVCRenderCommand.java
@@ -22,14 +22,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_asset_category_cp_display_layout"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryFriendlyURLMVCActionCommand.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryFriendlyURLMVCActionCommand.java
index ceb145c7f3a8c6..2e6e38b8e54731 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryFriendlyURLMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/EditAssetCategoryFriendlyURLMVCActionCommand.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/commerce_product_asset_categories/edit_asset_category_friendly_url"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/UploadTempAssetCategoryAttachmentMVCActionCommand.java b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/UploadTempAssetCategoryAttachmentMVCActionCommand.java
index 28e2c9d198e0a2..24ccaae9cdc0fb 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/UploadTempAssetCategoryAttachmentMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/java/com/liferay/commerce/product/asset/categories/web/internal/portlet/action/UploadTempAssetCategoryAttachmentMVCActionCommand.java
@@ -33,15 +33,15 @@
import com.liferay.upload.UploadHandler;
import com.liferay.upload.UploadResponseHandler;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -52,7 +52,7 @@
@Component(
configurationPid = "com.liferay.commerce.product.configuration.AttachmentsConfiguration",
property = {
- "javax.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
+ "jakarta.portlet.name=" + CommerceProductAssetCategoriesPortletKeys.ASSET_CATEGORIES_ADMIN,
"mvc.command.name=/commerce_product_asset_categories/upload_temp_asset_category_attachment"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/resources/META-INF/resources/init.jsp
index 831e66e3a8e620..34b79e05cba5f7 100644
--- a/modules/apps/commerce/commerce-product-asset-categories-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-asset-categories-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -55,7 +55,7 @@ page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %><%@
page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %>
-<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
diff --git a/modules/apps/commerce/commerce-product-content-api/build.gradle b/modules/apps/commerce/commerce-product-content-api/build.gradle
index d782af49a81da6..ec1cd536e3ea92 100644
--- a/modules/apps/commerce/commerce-product-content-api/build.gradle
+++ b/modules/apps/commerce/commerce-product-content-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-inventory-api")
compileOnly project(":apps:commerce:commerce-product-api")
diff --git a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPCompareContentHelper.java b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPCompareContentHelper.java
index f893714907b2c7..f84f7f92d39e64 100644
--- a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPCompareContentHelper.java
+++ b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPCompareContentHelper.java
@@ -15,15 +15,15 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Set;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPContentHelper.java b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPContentHelper.java
index e4e9999ee06982..3409c995e562db 100644
--- a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPContentHelper.java
+++ b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPContentHelper.java
@@ -24,17 +24,17 @@
import com.liferay.portal.kernel.repository.model.FileVersion;
import com.liferay.portal.kernel.theme.ThemeDisplay;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.ResourceURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.math.BigDecimal;
import java.util.List;
import java.util.Locale;
-import javax.portlet.RenderRequest;
-import javax.portlet.ResourceURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Alessio Antonio Rendina
* @author Ivica Cardic
diff --git a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPContentSkuOptionsHelper.java b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPContentSkuOptionsHelper.java
index 7db3e4331ea9e2..21ae969fb874a4 100644
--- a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPContentSkuOptionsHelper.java
+++ b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/helper/CPContentSkuOptionsHelper.java
@@ -7,7 +7,7 @@
import aQute.bnd.annotation.ProviderType;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/info/item/renderer/CPContentInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/info/item/renderer/CPContentInfoItemRenderer.java
index 53a488a7dd5503..4be19f020ded96 100644
--- a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/info/item/renderer/CPContentInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/info/item/renderer/CPContentInfoItemRenderer.java
@@ -5,10 +5,10 @@
package com.liferay.commerce.product.content.info.item.renderer;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/CPContentRenderer.java b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/CPContentRenderer.java
index 0c89137a2b297a..cbe6347f059ced 100644
--- a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/CPContentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/CPContentRenderer.java
@@ -9,10 +9,10 @@
import com.liferay.commerce.product.catalog.CPCatalogEntry;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/list/CPContentListRenderer.java b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/list/CPContentListRenderer.java
index b45da290d62317..774eceef6ee63d 100644
--- a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/list/CPContentListRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/list/CPContentListRenderer.java
@@ -5,10 +5,10 @@
package com.liferay.commerce.product.content.render.list;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/list/entry/CPContentListEntryRenderer.java b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/list/entry/CPContentListEntryRenderer.java
index 7e4e1b92909bf8..9a7e18bbcf1f7b 100644
--- a/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/list/entry/CPContentListEntryRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-api/src/main/java/com/liferay/commerce/product/content/render/list/entry/CPContentListEntryRenderer.java
@@ -5,10 +5,10 @@
package com.liferay.commerce.product.content.render.list.entry;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-category-web/build.gradle b/modules/apps/commerce/commerce-product-content-category-web/build.gradle
index 25794194a354b7..dbcbb9bf02d00f 100644
--- a/modules/apps/commerce/commerce-product-content-category-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-content-category-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-media-api")
diff --git a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/display/context/CPCategoryContentDisplayContext.java b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/display/context/CPCategoryContentDisplayContext.java
index f6a0753a7ec688..f8745edd83d526 100644
--- a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/display/context/CPCategoryContentDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/display/context/CPCategoryContentDisplayContext.java
@@ -27,9 +27,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/exportimport/portlet/preferences/processor/CPCategoryContentExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/exportimport/portlet/preferences/processor/CPCategoryContentExportImportPortletPreferencesProcessor.java
index 5feb1ffb824e4b..0a8ebcf8eb5882 100644
--- a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/exportimport/portlet/preferences/processor/CPCategoryContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/exportimport/portlet/preferences/processor/CPCategoryContentExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Michele Vigilante
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_CATEGORY_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_CATEGORY_CONTENT_WEB,
service = ExportImportPortletPreferencesProcessor.class
)
public class CPCategoryContentExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/CPCategoryContentPortlet.java b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/CPCategoryContentPortlet.java
index 41734ce381f836..2ce739cec22611 100644
--- a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/CPCategoryContentPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/CPCategoryContentPortlet.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,13 +41,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Category Detail",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_CATEGORY_CONTENT_WEB,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Category Detail",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CATEGORY_CONTENT_WEB,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/action/CPCategoryContentConfigurationAction.java b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/action/CPCategoryContentConfigurationAction.java
index f94f8fa113c148..bf8745586a4dcf 100644
--- a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/action/CPCategoryContentConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/action/CPCategoryContentConfigurationAction.java
@@ -18,7 +18,7 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_CATEGORY_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_CATEGORY_CONTENT_WEB,
service = ConfigurationAction.class
)
public class CPCategoryContentConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/display/template/CPCategoryContentPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/display/template/CPCategoryContentPortletDisplayTemplateHandler.java
index 0cc20de2e5c747..c1de0fe07c2cb9 100644
--- a/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/display/template/CPCategoryContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-content-category-web/src/main/java/com/liferay/commerce/product/content/category/web/internal/portlet/display/template/CPCategoryContentPortletDisplayTemplateHandler.java
@@ -31,7 +31,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_CATEGORY_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_CATEGORY_CONTENT_WEB,
service = TemplateHandler.class
)
public class CPCategoryContentPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-content-category-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-content-category-web/src/main/resources/META-INF/resources/init.jsp
index 5f84355bc3665d..985234df4f3e36 100644
--- a/modules/apps/commerce/commerce-product-content-category-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-content-category-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-product-content-search-web/build.gradle b/modules/apps/commerce/commerce-product-content-search-web/build.gradle
index 0a871584a8cf5b..588336b2d64585 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-content-search-web/build.gradle
@@ -1,10 +1,10 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPOptionsSearchFacetDisplayContext.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPOptionsSearchFacetDisplayContext.java
index 9ac6bbad6e42dc..3dfc11bba6f7f9 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPOptionsSearchFacetDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPOptionsSearchFacetDisplayContext.java
@@ -24,15 +24,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
+import jakarta.portlet.RenderRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.List;
import java.util.Locale;
-import javax.portlet.RenderRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Sbarra
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPPriceRangeFacetsDisplayContext.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPPriceRangeFacetsDisplayContext.java
index cb0bc0328e456d..4c4184a9c92368 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPPriceRangeFacetsDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPPriceRangeFacetsDisplayContext.java
@@ -24,9 +24,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
-import java.math.BigDecimal;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import java.math.BigDecimal;
/**
* @author Alec Sloan
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSearchResultsDisplayContext.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSearchResultsDisplayContext.java
index 5d43e62a18b6fa..9a6c44845d2e4b 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSearchResultsDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSearchResultsDisplayContext.java
@@ -40,16 +40,16 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSortDisplayContext.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSortDisplayContext.java
index 4ce803dd0e1b0c..d3c4e4acb1b3c7 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSortDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSortDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.module.configuration.ConfigurationException;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Balazs Breier
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSpecificationOptionFacetsDisplayContext.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSpecificationOptionFacetsDisplayContext.java
index 752f474c924a41..53bcf6c970a751 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSpecificationOptionFacetsDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSpecificationOptionFacetsDisplayContext.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSpecificationOptionsSearchFacetDisplayContext.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSpecificationOptionsSearchFacetDisplayContext.java
index b096cabbd25b65..2a0a9f08f24393 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSpecificationOptionsSearchFacetDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/CPSpecificationOptionsSearchFacetDisplayContext.java
@@ -12,13 +12,13 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.PortalUtil;
+import jakarta.portlet.RenderRequest;
+
import java.io.Serializable;
import java.util.List;
import java.util.Locale;
-import javax.portlet.RenderRequest;
-
/**
* @author Crescenzo Rega
*/
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/NullPortletURL.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/NullPortletURL.java
index db68353c78a2b8..2d882faa776253 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/NullPortletURL.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/NullPortletURL.java
@@ -5,20 +5,20 @@
package com.liferay.commerce.product.content.search.web.internal.display.context;
+import jakarta.portlet.MutableRenderParameters;
+import jakarta.portlet.PortletMode;
+import jakarta.portlet.PortletModeException;
+import jakarta.portlet.PortletSecurityException;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
+import jakarta.portlet.annotations.PortletSerializable;
+
import java.io.IOException;
import java.io.Writer;
import java.util.Map;
-import javax.portlet.MutableRenderParameters;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletModeException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
-import javax.portlet.annotations.PortletSerializable;
-
/**
* @author Marco Leo
*/
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/builder/CPOptionsSearchFacetDisplayContextBuilder.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/builder/CPOptionsSearchFacetDisplayContextBuilder.java
index 2a96144c290fb5..57181076ec6050 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/builder/CPOptionsSearchFacetDisplayContextBuilder.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/builder/CPOptionsSearchFacetDisplayContextBuilder.java
@@ -29,14 +29,14 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchRequest;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
+import jakarta.portlet.RenderRequest;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.portlet.RenderRequest;
-
/**
* @author Andrea Sbarra
*/
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/builder/CPSpecificationOptionsFacetDisplayContextBuilder.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/builder/CPSpecificationOptionsFacetDisplayContextBuilder.java
index cdd7c121c4a18f..68ece6cccccfa2 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/builder/CPSpecificationOptionsFacetDisplayContextBuilder.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/display/context/builder/CPSpecificationOptionsFacetDisplayContextBuilder.java
@@ -34,6 +34,9 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchRequest;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -42,9 +45,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-
/**
* @author Crescenzo Rega
*/
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPOptionFacetsExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPOptionFacetsExportImportPortletPreferencesProcessor.java
index 1b425c14060c34..79e9a3c71414b8 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPOptionFacetsExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPOptionFacetsExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
service = ExportImportPortletPreferencesProcessor.class
)
public class CPOptionFacetsExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPSearchResultsExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPSearchResultsExportImportPortletPreferencesProcessor.java
index dabac9fbcb6735..52d4c747a11202 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPSearchResultsExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPSearchResultsExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
service = ExportImportPortletPreferencesProcessor.class
)
public class CPSearchResultsExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPSpecificationOptionFacetsExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPSpecificationOptionFacetsExportImportPortletPreferencesProcessor.java
index 9f71a523561783..06691c5e7b9e1f 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPSpecificationOptionFacetsExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/exportimport/portlet/preferences/processor/CPSpecificationOptionFacetsExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
service = ExportImportPortletPreferencesProcessor.class
)
public class CPSpecificationOptionFacetsExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
index 296d37544c071b..7cb89014afdd7c 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
index 35fbf4f689456c..c346fb060a58dd 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/PaginationRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/PaginationRendererFormNavigatorEntry.java
index 2a50d1084caf0f..ca3970c478abb2 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/PaginationRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/PaginationRendererFormNavigatorEntry.java
@@ -11,11 +11,11 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
index 3bd9797c66cb7e..155b8ec00c91be 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
index 52bdfdc4e76550..a29d2970680837 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
@@ -10,9 +10,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPOptionFacetsPortlet.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPOptionFacetsPortlet.java
index 930a9687bc627d..7b2d363c26f30e 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPOptionFacetsPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPOptionFacetsPortlet.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchRequest;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,14 +41,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.restore-current-view=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Option Facet",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/option_facets/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Option Facet",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/option_facets/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPPriceRangeFacetsPortlet.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPPriceRangeFacetsPortlet.java
index c728e4b74eb7ad..5cd03f25b2f307 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPPriceRangeFacetsPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPPriceRangeFacetsPortlet.java
@@ -20,12 +20,12 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchRequest;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,14 +46,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.restore-current-view=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Price Range Facet",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/price_range_facets/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_PRICE_RANGE_FACETS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Price Range Facet",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/price_range_facets/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_PRICE_RANGE_FACETS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSearchResultsPortlet.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSearchResultsPortlet.java
index 09d788044dc7ae..9675bb4795043b 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSearchResultsPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSearchResultsPortlet.java
@@ -24,14 +24,14 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchRequest;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -51,14 +51,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.restore-current-view=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Search Results",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/search_results/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Search Results",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/search_results/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSearchResultsPortletProvider.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSearchResultsPortletProvider.java
index d4b856cf6ae701..628dfc8ee96610 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSearchResultsPortletProvider.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSearchResultsPortletProvider.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSortPortlet.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSortPortlet.java
index d9306fc200f025..65149f969fa53d 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSortPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSortPortlet.java
@@ -21,14 +21,14 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchRequest;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -48,13 +48,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.restore-current-view=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Sort", "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/sort/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_SORT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Sort",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/sort/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SORT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSpecificationOptionFacetsPortlet.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSpecificationOptionFacetsPortlet.java
index 43f12d6891ccbd..a1db122d3fbc38 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSpecificationOptionFacetsPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/CPSpecificationOptionFacetsPortlet.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchRequest;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,14 +44,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.restore-current-view=false",
"com.liferay.portlet.use-default-template=true",
- "javax.portlet.display-name=Specification Facet",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.template-path=/META-INF/resources/",
- "javax.portlet.init-param.view-template=/specification_option_facets/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=guest,power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Specification Facet",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.template-path=/META-INF/resources/",
+ "jakarta.portlet.init-param.view-template=/specification_option_facets/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=guest,power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPOptionFacetsPortletConfigurationAction.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPOptionFacetsPortletConfigurationAction.java
index 02f9e4d6fbe1ed..d7b7340b81acd1 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPOptionFacetsPortletConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPOptionFacetsPortletConfigurationAction.java
@@ -25,12 +25,12 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchRequest;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.RenderRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
service = ConfigurationAction.class
)
public class CPOptionFacetsPortletConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPPriceRangeFacetsConfigurationAction.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPPriceRangeFacetsConfigurationAction.java
index 2961a07e203d83..32166c4ff9bfa1 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPPriceRangeFacetsConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPPriceRangeFacetsConfigurationAction.java
@@ -20,7 +20,7 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
* @author Alec Sloan
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_PRICE_RANGE_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_PRICE_RANGE_FACETS,
service = ConfigurationAction.class
)
public class CPPriceRangeFacetsConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSearchResultsConfigurationAction.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSearchResultsConfigurationAction.java
index ea3403e3cc22d9..356c9d3384ae2e 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSearchResultsConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSearchResultsConfigurationAction.java
@@ -21,7 +21,7 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchResponse;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
service = ConfigurationAction.class
)
public class CPSearchResultsConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSortConfigurationAction.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSortConfigurationAction.java
index f6d9d7dc4d7d88..9f321531bb2632 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSortConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSortConfigurationAction.java
@@ -16,13 +16,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletPreferences;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
* @author Balazs Breier
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SORT,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SORT,
service = ConfigurationAction.class
)
public class CPSortConfigurationAction extends BaseConfigurationAction {
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSpecificationOptionFacetsPortletConfigurationAction.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSpecificationOptionFacetsPortletConfigurationAction.java
index 5ca2dc48f0d0b4..2334b967f6dbdd 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSpecificationOptionFacetsPortletConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/action/CPSpecificationOptionFacetsPortletConfigurationAction.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
service = ConfigurationAction.class
)
public class CPSpecificationOptionFacetsPortletConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPOptionFacetPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPOptionFacetPortletDisplayTemplateHandler.java
index 28ce9d26873ef0..b09aecf08e882e 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPOptionFacetPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPOptionFacetPortletDisplayTemplateHandler.java
@@ -28,7 +28,7 @@
* @author Andrea Sbarra
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
service = TemplateHandler.class
)
public class CPOptionFacetPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPSearchResultsPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPSearchResultsPortletDisplayTemplateHandler.java
index 277b1e51fd8af2..036acf015c31f0 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPSearchResultsPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPSearchResultsPortletDisplayTemplateHandler.java
@@ -33,7 +33,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
service = TemplateHandler.class
)
public class CPSearchResultsPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPSpecificationOptionFacetsPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPSpecificationOptionFacetsPortletDisplayTemplateHandler.java
index 09c454137de652..97adbe1d096f75 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPSpecificationOptionFacetsPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/display/template/CPSpecificationOptionFacetsPortletDisplayTemplateHandler.java
@@ -28,7 +28,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
service = TemplateHandler.class
)
public class CPSpecificationOptionFacetsPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPOptionFacetsPortletSharedSearchContributor.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPOptionFacetsPortletSharedSearchContributor.java
index d6dce51669c094..61b278cf6d8a48 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPOptionFacetsPortletSharedSearchContributor.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPOptionFacetsPortletSharedSearchContributor.java
@@ -43,12 +43,12 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchContributor;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchSettings;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -56,7 +56,7 @@
* @author Shuyang Zhou
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_OPTION_FACETS,
service = PortletSharedSearchContributor.class
)
public class CPOptionFacetsPortletSharedSearchContributor
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPPriceRangeFacetsPortletSharedSearchContributor.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPPriceRangeFacetsPortletSharedSearchContributor.java
index 9f26428f809c79..e37547f4573e0a 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPPriceRangeFacetsPortletSharedSearchContributor.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPPriceRangeFacetsPortletSharedSearchContributor.java
@@ -27,8 +27,8 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchContributor;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchSettings;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -37,7 +37,7 @@
* @author Shuyang Zhou
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_PRICE_RANGE_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_PRICE_RANGE_FACETS,
service = PortletSharedSearchContributor.class
)
public class CPPriceRangeFacetsPortletSharedSearchContributor
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSearchResultsPortletSharedSearchContributor.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSearchResultsPortletSharedSearchContributor.java
index 0869e6601adb25..356817df132e6a 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSearchResultsPortletSharedSearchContributor.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSearchResultsPortletSharedSearchContributor.java
@@ -37,10 +37,10 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchContributor;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchSettings;
-import java.util.NoSuchElementException;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
+import java.util.NoSuchElementException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,7 +49,7 @@
* @author Shuyang Zhou
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SEARCH_RESULTS,
service = PortletSharedSearchContributor.class
)
public class CPSearchResultsPortletSharedSearchContributor
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSortPortletSharedSearchContributor.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSortPortletSharedSearchContributor.java
index 79cf4f5b9e1076..fced645654eed4 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSortPortletSharedSearchContributor.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSortPortletSharedSearchContributor.java
@@ -31,11 +31,11 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchContributor;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchSettings;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,7 +44,7 @@
* @author Shuyang Zhou
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SORT,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SORT,
service = PortletSharedSearchContributor.class
)
public class CPSortPortletSharedSearchContributor
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSpecificationOptionFacetsPortletSharedSearchContributor.java b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSpecificationOptionFacetsPortletSharedSearchContributor.java
index e32f5904f76f4b..08285074eef02f 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSpecificationOptionFacetsPortletSharedSearchContributor.java
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/java/com/liferay/commerce/product/content/search/web/internal/portlet/shared/search/CPSpecificationOptionFacetsPortletSharedSearchContributor.java
@@ -43,12 +43,12 @@
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchContributor;
import com.liferay.portal.search.web.portlet.shared.search.PortletSharedSearchSettings;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -56,7 +56,7 @@
* @author Shuyang Zhou
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTION_FACETS,
service = PortletSharedSearchContributor.class
)
public class CPSpecificationOptionFacetsPortletSharedSearchContributor
diff --git a/modules/apps/commerce/commerce-product-content-search-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-content-search-web/src/main/resources/META-INF/resources/init.jsp
index 192783a50f5222..f833c5500b54a9 100644
--- a/modules/apps/commerce/commerce-product-content-search-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-content-search-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-product-content-web/build.gradle b/modules/apps/commerce/commerce-product-content-web/build.gradle
index 0e36f85319f64b..267a81178347ef 100644
--- a/modules/apps/commerce/commerce-product-content-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-content-web/build.gradle
@@ -3,13 +3,13 @@ dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.jaxrs", version: "1.0.0"
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/asset/display/page/portlet/AssetCategoryAssetDisplayPageFriendlyURLResolver.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/asset/display/page/portlet/AssetCategoryAssetDisplayPageFriendlyURLResolver.java
index 6d77d2237d8eb5..0f81474c1ea22a 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/asset/display/page/portlet/AssetCategoryAssetDisplayPageFriendlyURLResolver.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/asset/display/page/portlet/AssetCategoryAssetDisplayPageFriendlyURLResolver.java
@@ -48,11 +48,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/asset/display/page/portlet/CPDefinitionAssetDisplayPageFriendlyURLResolver.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/asset/display/page/portlet/CPDefinitionAssetDisplayPageFriendlyURLResolver.java
index c31b4a2f001d75..3c5e0a737df594 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/asset/display/page/portlet/CPDefinitionAssetDisplayPageFriendlyURLResolver.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/asset/display/page/portlet/CPDefinitionAssetDisplayPageFriendlyURLResolver.java
@@ -74,12 +74,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/BaseCPPublisherDisplayContext.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/BaseCPPublisherDisplayContext.java
index 7834fe0e54e86e..2ef158925fe0f8 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/BaseCPPublisherDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/BaseCPPublisherDisplayContext.java
@@ -28,12 +28,12 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPCompareContentDisplayContext.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPCompareContentDisplayContext.java
index 69549a85cdb89a..837107908231bc 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPCompareContentDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPCompareContentDisplayContext.java
@@ -30,16 +30,16 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPCompareContentMiniDisplayContext.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPCompareContentMiniDisplayContext.java
index 2bf3850c88a526..ec385b1ba8dd67 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPCompareContentMiniDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPCompareContentMiniDisplayContext.java
@@ -32,16 +32,16 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPContentConfigurationDisplayContext.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPContentConfigurationDisplayContext.java
index 89031e58360581..4dd510e91177af 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPContentConfigurationDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPContentConfigurationDisplayContext.java
@@ -15,7 +15,7 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPPublisherConfigurationDisplayContext.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPPublisherConfigurationDisplayContext.java
index 276698ec316a01..fab7a5b7014847 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPPublisherConfigurationDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPPublisherConfigurationDisplayContext.java
@@ -56,15 +56,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletPreferences;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPPublisherDisplayContext.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPPublisherDisplayContext.java
index 85d46e8703e633..093504347956bf 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPPublisherDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/CPPublisherDisplayContext.java
@@ -60,6 +60,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.filter.PortletURLWrapper;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.ArrayList;
@@ -68,11 +73,6 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletURL;
-import javax.portlet.filter.PortletURLWrapper;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/helper/CPContentRequestHelper.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/helper/CPContentRequestHelper.java
index 42137ba686a1b7..695c0a3f04140c 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/helper/CPContentRequestHelper.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/display/context/helper/CPContentRequestHelper.java
@@ -8,11 +8,11 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.JavaConstants;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPCompareContentExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPCompareContentExportImportPortletPreferencesProcessor.java
index 801e9bfe8a12cb..d456ea77ef2301 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPCompareContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPCompareContentExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_WEB,
service = ExportImportPortletPreferencesProcessor.class
)
public class CPCompareContentExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPCompareContentMiniExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPCompareContentMiniExportImportPortletPreferencesProcessor.java
index a903e7c886e5d1..73924426cd19d2 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPCompareContentMiniExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPCompareContentMiniExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_MINI_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_MINI_WEB,
service = ExportImportPortletPreferencesProcessor.class
)
public class CPCompareContentMiniExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPContentExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPContentExportImportPortletPreferencesProcessor.java
index fef5cba4d56728..51e0b7998d86f3 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPContentExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
service = ExportImportPortletPreferencesProcessor.class
)
public class CPContentExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPPublisherExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPPublisherExportImportPortletPreferencesProcessor.java
index 42d109c3f153f7..262d391175ed40 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPPublisherExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/exportimport/portlet/preferences/processor/CPPublisherExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Crescenzo Rega
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_PUBLISHER_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_PUBLISHER_WEB,
service = ExportImportPortletPreferencesProcessor.class
)
public class CPPublisherExportImportPortletPreferencesProcessor
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/contributor/CommerceFragmentCollectionContributor.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/contributor/CommerceFragmentCollectionContributor.java
index fe9553228bbc9f..0167a71c6d1b7a 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/contributor/CommerceFragmentCollectionContributor.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/contributor/CommerceFragmentCollectionContributor.java
@@ -8,7 +8,7 @@
import com.liferay.fragment.contributor.BaseFragmentCollectionContributor;
import com.liferay.fragment.contributor.FragmentCollectionContributor;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/AddToCartFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/AddToCartFragmentRenderer.java
index 0734a5445bc14a..62e2a89f4e71e9 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/AddToCartFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/AddToCartFragmentRenderer.java
@@ -35,17 +35,17 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/AvailabilityFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/AvailabilityFragmentRenderer.java
index 09547dfa682c17..f8f20a53238860 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/AvailabilityFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/AvailabilityFragmentRenderer.java
@@ -28,14 +28,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/DiscontinuedLabelFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/DiscontinuedLabelFragmentRenderer.java
index b5a5ebeb3c77e6..5fccd4539af49d 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/DiscontinuedLabelFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/DiscontinuedLabelFragmentRenderer.java
@@ -34,16 +34,16 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/DynamicFieldFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/DynamicFieldFragmentRenderer.java
index c0230a434e7cd2..84b967bca7e2e6 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/DynamicFieldFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/DynamicFieldFragmentRenderer.java
@@ -44,6 +44,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.math.BigDecimal;
@@ -51,11 +56,6 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ImageGalleryFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ImageGalleryFragmentRenderer.java
index 9339876f2abbf8..121fc7163df6e8 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ImageGalleryFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ImageGalleryFragmentRenderer.java
@@ -28,14 +28,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/OptionSelectorFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/OptionSelectorFragmentRenderer.java
index eb666d51c96a67..44e1c4025d37ce 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/OptionSelectorFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/OptionSelectorFragmentRenderer.java
@@ -28,14 +28,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/PriceFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/PriceFragmentRenderer.java
index ef008d7a7ffd1b..d6469b94851365 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/PriceFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/PriceFragmentRenderer.java
@@ -20,14 +20,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ProductCardFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ProductCardFragmentRenderer.java
index f48d373ba0be62..d4c983a3429f66 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ProductCardFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ProductCardFragmentRenderer.java
@@ -44,17 +44,17 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ProductSpecificationFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ProductSpecificationFragmentRenderer.java
index 68e433bb4551c0..af54a41e1947fa 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ProductSpecificationFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/ProductSpecificationFragmentRenderer.java
@@ -34,17 +34,17 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/RequestQuoteFragmentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/RequestQuoteFragmentRenderer.java
index f7fa721442045a..4dff82fb2338e8 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/RequestQuoteFragmentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/fragment/renderer/RequestQuoteFragmentRenderer.java
@@ -25,16 +25,16 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/data/set/provider/ReplacementCPInstanceFDSActionProvider.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/data/set/provider/ReplacementCPInstanceFDSActionProvider.java
index 8781ec9a0b164c..597b9b0a71a324 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/data/set/provider/ReplacementCPInstanceFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/data/set/provider/ReplacementCPInstanceFDSActionProvider.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/data/set/provider/ReplacementCPInstanceFDSDataProvider.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/data/set/provider/ReplacementCPInstanceFDSDataProvider.java
index 41dd3d63a607c1..33ebda92f58c36 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/data/set/provider/ReplacementCPInstanceFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/data/set/provider/ReplacementCPInstanceFDSDataProvider.java
@@ -29,14 +29,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/CustomRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/CustomRendererFormNavigatorEntry.java
index cb64a00a594705..df8d9d45ccc19a 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/CustomRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/CustomRendererFormNavigatorEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/FilterFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/FilterFormNavigatorEntry.java
index b05581ed5d5226..a98b8bc9dc3995 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/FilterFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/FilterFormNavigatorEntry.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import java.util.Locale;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/OrderingFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/OrderingFormNavigatorEntry.java
index d003c586b011cd..0a181e2b3d54da 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/OrderingFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/OrderingFormNavigatorEntry.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import java.util.Locale;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/PaginationFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/PaginationFormNavigatorEntry.java
index 97027b051347f9..0047975793a75b 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/PaginationFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/PaginationFormNavigatorEntry.java
@@ -10,9 +10,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/ProductEntriesFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/ProductEntriesFormNavigatorEntry.java
index 62951a8c58e5f2..b8d3716611e4f5 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/ProductEntriesFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/frontend/taglib/form/navigator/ProductEntriesFormNavigatorEntry.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import java.util.Locale;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPCompareContentHelperImpl.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPCompareContentHelperImpl.java
index 875f1ec0f88732..f3aeac610ba4c0 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPCompareContentHelperImpl.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPCompareContentHelperImpl.java
@@ -42,6 +42,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -49,11 +54,6 @@
import java.util.Locale;
import java.util.Set;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPContentHelperImpl.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPContentHelperImpl.java
index 0da2bc374250ac..d0c15dc3e7a2de 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPContentHelperImpl.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPContentHelperImpl.java
@@ -84,6 +84,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.ResourceURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.math.BigDecimal;
import java.text.Format;
@@ -91,13 +98,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletPreferences;
-import javax.portlet.RenderRequest;
-import javax.portlet.ResourceURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPContentSkuOptionsHelperImpl.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPContentSkuOptionsHelperImpl.java
index 1e80aae3c31823..b32690ce8bc600 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPContentSkuOptionsHelperImpl.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPContentSkuOptionsHelperImpl.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.vulcan.dto.converter.DTOConverter;
-import java.math.BigDecimal;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPPublisherWebHelper.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPPublisherWebHelper.java
index 1542fc768ad2ca..fcf6c722585ce5 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPPublisherWebHelper.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/helper/CPPublisherWebHelper.java
@@ -26,14 +26,14 @@
import com.liferay.portal.kernel.xml.Element;
import com.liferay.portal.kernel.xml.SAXReaderUtil;
+import jakarta.portlet.PortletPreferences;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/AvailabilityLabelInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/AvailabilityLabelInfoItemRenderer.java
index 465529ca8e9292..f01acacbd1c98c 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/AvailabilityLabelInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/AvailabilityLabelInfoItemRenderer.java
@@ -31,12 +31,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPAttachmentFileEntryInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPAttachmentFileEntryInfoItemRenderer.java
index 57af360fe7ec1b..5bac1c0a1e77d4 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPAttachmentFileEntryInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPAttachmentFileEntryInfoItemRenderer.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPDefinitionLinkInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPDefinitionLinkInfoItemRenderer.java
index 83aac7cfdf8750..b20f00efa5464c 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPDefinitionLinkInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPDefinitionLinkInfoItemRenderer.java
@@ -10,12 +10,12 @@
import com.liferay.info.item.renderer.InfoItemRenderer;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPDefinitionSpecificationOptionValueInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPDefinitionSpecificationOptionValueInfoItemRenderer.java
index cb573f9228e414..13cffa46370955 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPDefinitionSpecificationOptionValueInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/CPDefinitionSpecificationOptionValueInfoItemRenderer.java
@@ -10,12 +10,12 @@
import com.liferay.info.item.renderer.InfoItemRenderer;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/GroupedCPContentInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/GroupedCPContentInfoItemRenderer.java
index 4a10cb4a89274a..5e1646ddb6da6e 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/GroupedCPContentInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/GroupedCPContentInfoItemRenderer.java
@@ -10,13 +10,13 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/ImageGalleryInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/ImageGalleryInfoItemRenderer.java
index 5bd40ca814c689..6489805df6356a 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/ImageGalleryInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/ImageGalleryInfoItemRenderer.java
@@ -26,13 +26,13 @@
import com.liferay.portal.template.react.renderer.ComponentDescriptor;
import com.liferay.portal.template.react.renderer.ReactRenderer;
-import java.util.List;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/OptionSelectorInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/OptionSelectorInfoItemRenderer.java
index 195ba4a4940279..a4a83fbfc3fa44 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/OptionSelectorInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/OptionSelectorInfoItemRenderer.java
@@ -15,12 +15,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/PriceInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/PriceInfoItemRenderer.java
index e89dea06d8f70f..b25bff8483a5fa 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/PriceInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/PriceInfoItemRenderer.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/ProductCardInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/ProductCardInfoItemRenderer.java
index 13bd659809482a..bbaa81980e38bb 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/ProductCardInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/ProductCardInfoItemRenderer.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Locale;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/SimpleCPContentInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/SimpleCPContentInfoItemRenderer.java
index 3f087ceaa26238..c15ec1ba154292 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/SimpleCPContentInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/SimpleCPContentInfoItemRenderer.java
@@ -10,13 +10,13 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/VirtualCPContentInfoItemRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/VirtualCPContentInfoItemRenderer.java
index 835b3410ece875..0badb87b3f980d 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/VirtualCPContentInfoItemRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/item/renderer/VirtualCPContentInfoItemRenderer.java
@@ -10,13 +10,13 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPAttachmentFileEntryBasicInfoListRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPAttachmentFileEntryBasicInfoListRenderer.java
index 2f3fa52a0ff42f..fdcfb552c201b6 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPAttachmentFileEntryBasicInfoListRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPAttachmentFileEntryBasicInfoListRenderer.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPDefinitionLinkBasicInfoListRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPDefinitionLinkBasicInfoListRenderer.java
index 30fe92e8386dd0..0022685a635fc1 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPDefinitionLinkBasicInfoListRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPDefinitionLinkBasicInfoListRenderer.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPDefinitionSpecificationOptionValueBasicInfoListRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPDefinitionSpecificationOptionValueBasicInfoListRenderer.java
index c4487371a6f00d..3743282544d752 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPDefinitionSpecificationOptionValueBasicInfoListRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/info/list/renderer/BaseCPDefinitionSpecificationOptionValueBasicInfoListRenderer.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/item/selector/CPDefinitionItemSelectorView.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/item/selector/CPDefinitionItemSelectorView.java
index 61936c0d545f93..6f9371f3c4d78d 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/item/selector/CPDefinitionItemSelectorView.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/item/selector/CPDefinitionItemSelectorView.java
@@ -27,6 +27,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
@@ -34,14 +42,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPCompareContentMiniPortlet.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPCompareContentMiniPortlet.java
index 0ccaf2fee61278..789ba402cae123 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPCompareContentMiniPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPCompareContentMiniPortlet.java
@@ -24,12 +24,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -48,13 +48,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Comparison Bar",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/compare_products_mini/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_MINI_WEB,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Comparison Bar",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/compare_products_mini/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_MINI_WEB,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPCompareContentPortlet.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPCompareContentPortlet.java
index 755f3177213cb6..7ba5c75505328b 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPCompareContentPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPCompareContentPortlet.java
@@ -24,14 +24,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,13 +50,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Comparison Table",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/compare_products/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_WEB,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Comparison Table",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/compare_products/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_WEB,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPContentPortlet.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPContentPortlet.java
index b1ab1b1f9aa21d..79bb029bf4bad1 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPContentPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPContentPortlet.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,13 +44,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Details",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/product_detail/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Details",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/product_detail/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPPublisherPortlet.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPPublisherPortlet.java
index 1b684fb21f05b5..1fdeb7ea18d95a 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPPublisherPortlet.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/CPPublisherPortlet.java
@@ -34,12 +34,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -59,13 +59,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=false",
- "javax.portlet.display-name=Product Publisher",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/product_publisher/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_PUBLISHER_WEB,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Publisher",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/product_publisher/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_PUBLISHER_WEB,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPCompareContentConfigurationAction.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPCompareContentConfigurationAction.java
index 1d45065681f477..1c8a5d04cc41c9 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPCompareContentConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPCompareContentConfigurationAction.java
@@ -20,7 +20,7 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_WEB,
service = ConfigurationAction.class
)
public class CPCompareContentConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPCompareContentMiniConfigurationAction.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPCompareContentMiniConfigurationAction.java
index e8cf7fa06da923..933ccda6b267c6 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPCompareContentMiniConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPCompareContentMiniConfigurationAction.java
@@ -20,7 +20,7 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_MINI_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_MINI_WEB,
service = ConfigurationAction.class
)
public class CPCompareContentMiniConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPContentConfigurationAction.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPContentConfigurationAction.java
index 7cd28b1ceee653..f82ef79f8f5c88 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPContentConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPContentConfigurationAction.java
@@ -18,7 +18,7 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
service = ConfigurationAction.class
)
public class CPContentConfigurationAction extends BaseConfigurationAction {
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPPublisherConfigurationAction.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPPublisherConfigurationAction.java
index 2a54c9cd1f28d4..1b924cc1dddfdd 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPPublisherConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/CPPublisherConfigurationAction.java
@@ -44,19 +44,19 @@
import com.liferay.portal.kernel.xml.SAXReaderUtil;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletPreferences;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -64,7 +64,7 @@
* @author Marco Leo
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_PUBLISHER_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_PUBLISHER_WEB,
service = ConfigurationAction.class
)
public class CPPublisherConfigurationAction extends BaseConfigurationAction {
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/ViewCPAttachmentsMVCResourceCommand.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/ViewCPAttachmentsMVCResourceCommand.java
index 2cb35e327a34af..bcbb7d1611cfd4 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/ViewCPAttachmentsMVCResourceCommand.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/action/ViewCPAttachmentsMVCResourceCommand.java
@@ -25,11 +25,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
-import javax.portlet.PortletException;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
"mvc.command.name=/cp_content_web/view_cp_attachments"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPCompareContentMiniPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPCompareContentMiniPortletDisplayTemplateHandler.java
index 0b1a66f27f435a..24e0d839df54ac 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPCompareContentMiniPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPCompareContentMiniPortletDisplayTemplateHandler.java
@@ -33,7 +33,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_MINI_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_MINI_WEB,
service = TemplateHandler.class
)
public class CPCompareContentMiniPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPCompareContentPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPCompareContentPortletDisplayTemplateHandler.java
index 32655ad9245193..58ca0580a09e27 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPCompareContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPCompareContentPortletDisplayTemplateHandler.java
@@ -33,7 +33,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_COMPARE_CONTENT_WEB,
service = TemplateHandler.class
)
public class CPCompareContentPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPContentPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPContentPortletDisplayTemplateHandler.java
index 8d597b8c33815c..d9d904f29fc9bd 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPContentPortletDisplayTemplateHandler.java
@@ -32,7 +32,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_CONTENT_WEB,
service = TemplateHandler.class
)
public class CPContentPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPPublisherPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPPublisherPortletDisplayTemplateHandler.java
index 948ad432171372..6842aaed4d3f62 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPPublisherPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/display/template/CPPublisherPortletDisplayTemplateHandler.java
@@ -32,7 +32,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_PUBLISHER_WEB,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_PUBLISHER_WEB,
service = TemplateHandler.class
)
public class CPPublisherPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/template/CPCompareContentTemplateContextContributor.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/template/CPCompareContentTemplateContextContributor.java
index 858270a1c7bd52..43028e2ecaf5b3 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/template/CPCompareContentTemplateContextContributor.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/portlet/template/CPCompareContentTemplateContextContributor.java
@@ -9,9 +9,9 @@
import com.liferay.commerce.product.content.helper.CPContentHelper;
import com.liferay.portal.kernel.template.TemplateContextContributor;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
index e77a0e1d8c8910..bd4e6ecb4d23b5 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
index 19d76d2b144403..7d1641caa62f83 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
index cc9edcf022eeea..d8edba9d2a633e 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
index 3842598252cf60..8b295cbeeab52a 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
@@ -10,9 +10,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
index 347e0eeea1aef0..efba0f987da830 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
index d82e20633438a4..d6d0ed2b6835d3 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
index 9e5de21aaa0ff3..a421f0f3a0cf78 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
index d8e70cc3db9ed1..13c6d585362828 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/compare/mini/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
@@ -10,9 +10,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/content/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/content/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
index e73300a7bb8972..86dc8f77f7cc9d 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/content/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/content/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/content/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/content/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
index b8219da6580d60..6b7264eaa34a6d 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/content/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/content/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
@@ -10,9 +10,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
index b4e53c2fc35d50..03548684523d0e 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/ADTFormNavigatorEntry.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.GetterUtil;
-import java.util.Locale;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
index 82f42db7c435ba..c32b5fe29ae623 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/CPTypeRendererFormNavigatorEntry.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
-import java.util.Locale;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
+import java.util.ResourceBundle;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/DataSourceFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/DataSourceFormNavigatorEntry.java
index 4f67e09b17c3c7..71ae0174e6fbbf 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/DataSourceFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/DataSourceFormNavigatorEntry.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.theme.PortletDisplay;
import com.liferay.portal.kernel.theme.ThemeDisplay;
-import java.util.Locale;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
index ea303ac3bf08be..7a1da136243b1e 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/ProductListRendererFormNavigatorEntry.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
-import java.util.Locale;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
+import java.util.ResourceBundle;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/RenderSelectionFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/RenderSelectionFormNavigatorEntry.java
index ffad8aced384a5..e83a626d740a88 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/RenderSelectionFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/RenderSelectionFormNavigatorEntry.java
@@ -10,9 +10,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
index 6289847eaa5bfa..7fb0e87bd4e863 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/product/publisher/frontend/taglib/form/navigator/SelectionStyleFormNavigatorEntry.java
@@ -10,9 +10,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/DefaultCPContentRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/DefaultCPContentRenderer.java
index 68eb57d81df0a7..2626e830ce6b23 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/DefaultCPContentRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/DefaultCPContentRenderer.java
@@ -18,13 +18,13 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/CompareProductsCPContentListRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/CompareProductsCPContentListRenderer.java
index 000387acf3e928..557da93e00d8d7 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/CompareProductsCPContentListRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/CompareProductsCPContentListRenderer.java
@@ -11,12 +11,12 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/CompareProductsMiniCPContentListRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/CompareProductsMiniCPContentListRenderer.java
index 0687d4b095f2b4..c6abdf45e9e590 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/CompareProductsMiniCPContentListRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/CompareProductsMiniCPContentListRenderer.java
@@ -11,12 +11,12 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/ProductPublisherCPContentListRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/ProductPublisherCPContentListRenderer.java
index 4f4b6465710735..d96ab0567d68b2 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/ProductPublisherCPContentListRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/ProductPublisherCPContentListRenderer.java
@@ -13,13 +13,13 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/entry/DefaultCPContentListEntryRenderer.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/entry/DefaultCPContentListEntryRenderer.java
index 39c762b658afc6..25c80adec5478b 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/entry/DefaultCPContentListEntryRenderer.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/render/list/entry/DefaultCPContentListEntryRenderer.java
@@ -11,13 +11,13 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/util/CPMediaUtil.java b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/util/CPMediaUtil.java
index df39292b2b57f0..04276aebe3185e 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/util/CPMediaUtil.java
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/java/com/liferay/commerce/product/content/web/internal/util/CPMediaUtil.java
@@ -29,11 +29,11 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portlet.documentlibrary.lar.FileEntryUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/fragment/renderer/dynamic_field/init.jsp b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/fragment/renderer/dynamic_field/init.jsp
index 93e72ede9c0d44..dd61ce32358081 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/fragment/renderer/dynamic_field/init.jsp
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/fragment/renderer/dynamic_field/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/frontend" prefix="liferay-frontend" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/fragment/renderer/product_specification/init.jsp b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/fragment/renderer/product_specification/init.jsp
index 1f15f5792dbc5a..8231e8bc094b5a 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/fragment/renderer/product_specification/init.jsp
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/fragment/renderer/product_specification/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/info/item/renderer/init.jsp b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/info/item/renderer/init.jsp
index fd263b1c128012..bbc9312f1c6f89 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/info/item/renderer/init.jsp
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/info/item/renderer/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/adaptive-media-image" prefix="liferay-adaptive-media" %><%@
taglib uri="http://liferay.com/tld/commerce-ui" prefix="commerce-ui" %><%@
diff --git a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/init.jsp
index 98fa580a7968fb..1a582e5a62861b 100644
--- a/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -87,6 +87,8 @@ page import="com.liferay.portal.kernel.util.StringUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.math.BigDecimal" %>
<%@ page import="java.text.Format" %>
@@ -97,8 +99,6 @@ page import="java.util.List" %><%@
page import="java.util.Map" %><%@
page import="java.util.Set" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-product-definitions-web/build.gradle b/modules/apps/commerce/commerce-product-definitions-web/build.gradle
index 07726d8eae8b28..eadf93f83723ea 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-definitions-web/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:ai-creator:ai-creator-openai-api")
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPConfigurationListPanelApp.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPConfigurationListPanelApp.java
index e2e803fe61d4c1..a8c9d26d0570c1 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPConfigurationListPanelApp.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPConfigurationListPanelApp.java
@@ -52,7 +52,7 @@ public boolean isShow(PermissionChecker permissionChecker, Group group)
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPDefinitionsPanelApp.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPDefinitionsPanelApp.java
index e1870ebe3ee3a6..641dab5fb16f9c 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPDefinitionsPanelApp.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/application/list/CPDefinitionsPanelApp.java
@@ -38,7 +38,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionAssetRenderer.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionAssetRenderer.java
index a5a7b66d8b3b00..0fe7f5cb2c6995 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionAssetRenderer.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionAssetRenderer.java
@@ -32,15 +32,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionAssetRendererFactory.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionAssetRendererFactory.java
index ef826650256890..e81d9097464828 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionAssetRendererFactory.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionAssetRendererFactory.java
@@ -28,15 +28,15 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
-import java.util.Locale;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowState;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowState;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
+import java.util.ResourceBundle;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,7 +45,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = AssetRendererFactory.class
)
public class CPDefinitionAssetRendererFactory
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionLinkAssetRenderer.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionLinkAssetRenderer.java
index ffb7a3826cb067..c1eb55d9c01a36 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionLinkAssetRenderer.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionLinkAssetRenderer.java
@@ -14,13 +14,13 @@
import com.liferay.portal.kernel.language.LanguageUtil;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Danny Situ
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionLinkAssetRendererFactory.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionLinkAssetRendererFactory.java
index b56c4924560be9..468af26b95bc9f 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionLinkAssetRendererFactory.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/asset/CPDefinitionLinkAssetRendererFactory.java
@@ -21,7 +21,7 @@
* @author Danny Situ
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = AssetRendererFactory.class
)
public class CPDefinitionLinkAssetRendererFactory
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPAttachmentFileEntryCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPAttachmentFileEntryCustomAttributesDisplay.java
index af4048edcb9278..64470a0a079673 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPAttachmentFileEntryCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPAttachmentFileEntryCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Ethan Bustad
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = CustomAttributesDisplay.class
)
public class CPAttachmentFileEntryCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionCustomAttributesDisplay.java
index 6614e5c6cd5217..9d3ff7f9d59b13 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = CustomAttributesDisplay.class
)
public class CPDefinitionCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionLinkCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionLinkCustomAttributesDisplay.java
index dd93c22a70f79f..c8d06aab52fe32 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionLinkCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionLinkCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Marco Leo
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = CustomAttributesDisplay.class
)
public class CPDefinitionLinkCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionOptionRelCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionOptionRelCustomAttributesDisplay.java
index 25f71f70d3043f..e91fc6d1ad46a5 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionOptionRelCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionOptionRelCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = CustomAttributesDisplay.class
)
public class CPDefinitionOptionRelCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionOptionValueRelCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionOptionValueRelCustomAttributesDisplay.java
index 49327debce3321..710f64d01eea35 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionOptionValueRelCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionOptionValueRelCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = CustomAttributesDisplay.class
)
public class CPDefinitionOptionValueRelCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionSpecificationOptionValueCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionSpecificationOptionValueCustomAttributesDisplay.java
index 881e818339a546..9aa009d117bbe0 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionSpecificationOptionValueCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPDefinitionSpecificationOptionValueCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Andrea Di Giorgi
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = CustomAttributesDisplay.class
)
public class CPDefinitionSpecificationOptionValueCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPInstanceCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPInstanceCustomAttributesDisplay.java
index e807f05b0426a4..a09022067d4bbb 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPInstanceCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPInstanceCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = CustomAttributesDisplay.class
)
public class CPInstanceCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPSpecificationOptionCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPSpecificationOptionCustomAttributesDisplay.java
index 2ce7f8ba6589d2..aac1ed92ce62d3 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPSpecificationOptionCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/custom/attributes/CPSpecificationOptionCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Andrea Di Giorgi
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = CustomAttributesDisplay.class
)
public class CPSpecificationOptionCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPAttachmentFileEntriesDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPAttachmentFileEntriesDisplayContext.java
index dbeb8f1e454564..73848161a64cdd 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPAttachmentFileEntriesDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPAttachmentFileEntriesDisplayContext.java
@@ -38,15 +38,15 @@
import com.liferay.portal.kernel.security.permission.ActionKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPConfigurationListDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPConfigurationListDisplayContext.java
index 46f14c134cc813..f799de96de5be0 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPConfigurationListDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPConfigurationListDisplayContext.java
@@ -48,13 +48,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Sbarra
*/
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPConfigurationListQualifiersDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPConfigurationListQualifiersDisplayContext.java
index af3a2c83283226..a3c5bc50e36aa1 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPConfigurationListQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPConfigurationListQualifiersDisplayContext.java
@@ -37,13 +37,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Danny Situ
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionConfigurationDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionConfigurationDisplayContext.java
index e73e5efef38237..e718361abd5c5f 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionConfigurationDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionConfigurationDisplayContext.java
@@ -43,11 +43,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionDisplayLayoutDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionDisplayLayoutDisplayContext.java
index bb5bc8bcbae97a..ca49726a4f120a 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionDisplayLayoutDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionDisplayLayoutDisplayContext.java
@@ -43,9 +43,9 @@
import com.liferay.portal.kernel.util.PortalUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Collections;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionLinkDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionLinkDisplayContext.java
index 7ab6df6092e8bf..ef65dd8531a8ed 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionLinkDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionLinkDisplayContext.java
@@ -34,14 +34,14 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionOptionRelDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionOptionRelDisplayContext.java
index 13bdab279586b9..109c918cc3989c 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionOptionRelDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionOptionRelDisplayContext.java
@@ -49,16 +49,16 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionOptionValueRelDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionOptionValueRelDisplayContext.java
index b57acc50c989cc..1264d4e5445141 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionOptionValueRelDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionOptionValueRelDisplayContext.java
@@ -32,13 +32,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Calendar;
import java.util.Date;
import java.util.Objects;
import java.util.TimeZone;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionSpecificationOptionValueDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionSpecificationOptionValueDisplayContext.java
index 062ff66a5f4db9..0c43b71ce556eb 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionSpecificationOptionValueDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionSpecificationOptionValueDisplayContext.java
@@ -36,6 +36,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -44,10 +48,6 @@
import java.util.Objects;
import java.util.TreeMap;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Di Giorgi
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionsDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionsDisplayContext.java
index 396427e4ebb708..36ddb775d969f0 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionsDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPDefinitionsDisplayContext.java
@@ -63,15 +63,15 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.taglib.util.CustomAttributesUtil;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPInstanceDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPInstanceDisplayContext.java
index 4f2ffa508e234b..1c6c9e0c3ba05d 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPInstanceDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPInstanceDisplayContext.java
@@ -43,6 +43,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.CustomAttributesUtil;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.math.BigDecimal;
import java.util.Calendar;
@@ -51,11 +56,6 @@
import java.util.List;
import java.util.Map;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* @author Alessio Antonio Rendina
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPInstanceUnitOfMeasureDisplayContext.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPInstanceUnitOfMeasureDisplayContext.java
index 7d462f3eb2d39f..99bcd880525ef9 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPInstanceUnitOfMeasureDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/display/context/CPInstanceUnitOfMeasureDisplayContext.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ListUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Crescenzo Rega
*/
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/editor/configuration/CommerceCKEditorConfigContributor.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/editor/configuration/CommerceCKEditorConfigContributor.java
index caa81b72fceef0..edf8a2309ecc2e 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/editor/configuration/CommerceCKEditorConfigContributor.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/editor/configuration/CommerceCKEditorConfigContributor.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Map;
+import jakarta.portlet.PortletMode;
-import javax.portlet.PortletMode;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
* @author Andrea Sbarra
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
service = EditorConfigContributor.class
)
public class CommerceCKEditorConfigContributor
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CPConfigurationListFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CPConfigurationListFDSActionProvider.java
index 2ce7221254d14c..10f7fe678f0363 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CPConfigurationListFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CPConfigurationListFDSActionProvider.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAccountGroupFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAccountGroupFDSActionProvider.java
index 2fab524819b032..753adfde47d309 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAccountGroupFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAccountGroupFDSActionProvider.java
@@ -24,12 +24,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAccountGroupFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAccountGroupFDSDataProvider.java
index 2ebf9adec164c7..c17aae89841e15 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAccountGroupFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAccountGroupFDSDataProvider.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.LinkedHashMap;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAttachmentFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAttachmentFDSDataProvider.java
index 95dddf287072ff..516b0eb2dee0aa 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAttachmentFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductAttachmentFDSDataProvider.java
@@ -31,13 +31,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductChannelFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductChannelFDSActionProvider.java
index 9d56159a6ce530..d0cedd75f80a31 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductChannelFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductChannelFDSActionProvider.java
@@ -24,12 +24,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductChannelFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductChannelFDSDataProvider.java
index 7634b54e9e9c02..88629cd25ed6c8 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductChannelFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductChannelFDSDataProvider.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionLinkFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionLinkFDSActionProvider.java
index 8a888209c5d9f7..76ceedd08c984e 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionLinkFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionLinkFDSActionProvider.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionLinkFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionLinkFDSDataProvider.java
index 7ca31585844fc7..f97972cf7cf0c5 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionLinkFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionLinkFDSDataProvider.java
@@ -31,14 +31,14 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionSpecificationFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionSpecificationFDSActionProvider.java
index 369265f3a046bb..5d5a3e8aa5a6f0 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionSpecificationFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionSpecificationFDSActionProvider.java
@@ -30,13 +30,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionSpecificationFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionSpecificationFDSDataProvider.java
index 86576b52058e7c..fa942fdac082b3 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionSpecificationFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDefinitionSpecificationFDSDataProvider.java
@@ -27,9 +27,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDisplayPageFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDisplayPageFDSActionProvider.java
index 219a0fa7cd0b72..4c026f9de0c8e0 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDisplayPageFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDisplayPageFDSActionProvider.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDisplayPageFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDisplayPageFDSDataProvider.java
index a851d3d87e2882..86ce15b0a9fd28 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDisplayPageFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductDisplayPageFDSDataProvider.java
@@ -28,12 +28,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductImageFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductImageFDSDataProvider.java
index 48d08575a362bc..ea138edb8b9b77 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductImageFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductImageFDSDataProvider.java
@@ -31,13 +31,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductInstanceFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductInstanceFDSActionProvider.java
index 1560e7d9209984..ff1a236cff5560 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductInstanceFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductInstanceFDSActionProvider.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductInstanceFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductInstanceFDSDataProvider.java
index 8434f2705e49e9..677e8cf6208d09 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductInstanceFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductInstanceFDSDataProvider.java
@@ -38,13 +38,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.StringJoiner;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductMediaFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductMediaFDSActionProvider.java
index 76324aba13f10c..ca52237606d63d 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductMediaFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductMediaFDSActionProvider.java
@@ -32,13 +32,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionFDSActionProvider.java
index 6a14fbe6cd3e91..2de2acde990796 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionFDSActionProvider.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.security.permission.ActionKeys;
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
-import java.util.List;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionFDSDataProvider.java
index 7904d341aadb27..d9c953764dd39d 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionFDSDataProvider.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionValueFDSActionProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionValueFDSActionProvider.java
index 83cc723cb0d318..952b300fc009eb 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionValueFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionValueFDSActionProvider.java
@@ -30,14 +30,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionValueFDSDataProvider.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionValueFDSDataProvider.java
index 7d20f75ad4b97e..fe65a126483a07 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionValueFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/data/set/provider/CommerceProductOptionValueFDSDataProvider.java
@@ -34,14 +34,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListDetailsScreenNavigationEntry.java
index d49b9a2a291f8f..15517c88df4e03 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListDetailsScreenNavigationEntry.java
@@ -20,11 +20,11 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListEntriesScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListEntriesScreenNavigationEntry.java
index 6a18eabb231fd2..012cae6372e597 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListEntriesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListEntriesScreenNavigationEntry.java
@@ -20,11 +20,11 @@
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListQualifiersScreenNavigationEntry.java
index 5cf4d2651e7fbd..16a8c5fc282d8c 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPConfigurationListQualifiersScreenNavigationEntry.java
@@ -25,10 +25,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionAttachmentsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionAttachmentsScreenNavigationEntry.java
index 48e15c29f716c0..5cdfdfd5d1d7ea 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionAttachmentsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionAttachmentsScreenNavigationEntry.java
@@ -28,13 +28,13 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionConfigurationScreenNavigationEntry.java
index 5e8b17b4cb4a44..a6b37c61908f09 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionConfigurationScreenNavigationEntry.java
@@ -40,11 +40,11 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionDetailsScreenNavigationEntry.java
index c9691b56ce588f..19e15cd6a36513 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionDetailsScreenNavigationEntry.java
@@ -32,11 +32,11 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionInstancesScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionInstancesScreenNavigationEntry.java
index cfd542d42b7ef2..6a5e5bf52f589b 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionInstancesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionInstancesScreenNavigationEntry.java
@@ -31,11 +31,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionOptionsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionOptionsScreenNavigationEntry.java
index c34f1342a80376..d0c8750c3f39c9 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionOptionsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionOptionsScreenNavigationEntry.java
@@ -27,11 +27,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionProductRelationsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionProductRelationsScreenNavigationEntry.java
index 692041a76dc310..f46aeeb02f93c2 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionProductRelationsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionProductRelationsScreenNavigationEntry.java
@@ -27,10 +27,10 @@
import com.liferay.portal.kernel.service.WorkflowDefinitionLinkLocalService;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionVisibilityScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionVisibilityScreenNavigationEntry.java
index 45aa3c585e6248..db990822bb4e97 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionVisibilityScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPDefinitionVisibilityScreenNavigationEntry.java
@@ -33,11 +33,11 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPInstanceDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPInstanceDetailsScreenNavigationEntry.java
index 81420565d62dea..8715619a817817 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPInstanceDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPInstanceDetailsScreenNavigationEntry.java
@@ -29,11 +29,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPInstanceUnitOfMeasureScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPInstanceUnitOfMeasureScreenNavigationEntry.java
index 3d55ce0b7c2ef5..ba62228f4f0981 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPInstanceUnitOfMeasureScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CPInstanceUnitOfMeasureScreenNavigationEntry.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CommerceChannelProductDisplayLayoutsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CommerceChannelProductDisplayLayoutsScreenNavigationEntry.java
index 5e9fa3b79fa551..02e4374887ef38 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CommerceChannelProductDisplayLayoutsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/CommerceChannelProductDisplayLayoutsScreenNavigationEntry.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.service.permission.GroupPermissionUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/LayoutCPDefinitionDisplayLayoutSelectionScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/LayoutCPDefinitionDisplayLayoutSelectionScreenNavigationEntry.java
index 58678ef021d3ff..c569deb68df80a 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/LayoutCPDefinitionDisplayLayoutSelectionScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/LayoutCPDefinitionDisplayLayoutSelectionScreenNavigationEntry.java
@@ -28,11 +28,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/LayoutPageTemplateEntryCPDefinitionDisplayLayoutSelectionScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/LayoutPageTemplateEntryCPDefinitionDisplayLayoutSelectionScreenNavigationEntry.java
index ebe53bb7ab2185..de31a6400e14f8 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/LayoutPageTemplateEntryCPDefinitionDisplayLayoutSelectionScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/frontend/taglib/servlet/taglib/LayoutPageTemplateEntryCPDefinitionDisplayLayoutSelectionScreenNavigationEntry.java
@@ -28,11 +28,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/health/status/CPConfigurationListEligibilityCommerceHealthStatus.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/health/status/CPConfigurationListEligibilityCommerceHealthStatus.java
index 74005ad18a08e2..b26ae4860f028c 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/health/status/CPConfigurationListEligibilityCommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/health/status/CPConfigurationListEligibilityCommerceHealthStatus.java
@@ -33,6 +33,8 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -46,8 +48,6 @@
import java.util.ResourceBundle;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/CheckboxCommerceOptionTypeImpl.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/CheckboxCommerceOptionTypeImpl.java
index d4ee5638a915ae..510ba34d941a0f 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/CheckboxCommerceOptionTypeImpl.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/CheckboxCommerceOptionTypeImpl.java
@@ -22,13 +22,13 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/CheckboxMultipleCommerceOptionTypeImpl.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/CheckboxMultipleCommerceOptionTypeImpl.java
index afc058fbbcd1cd..ee44b429570451 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/CheckboxMultipleCommerceOptionTypeImpl.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/CheckboxMultipleCommerceOptionTypeImpl.java
@@ -21,13 +21,13 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/DateCommerceOptionTypeImpl.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/DateCommerceOptionTypeImpl.java
index 6ce60b2ca34c4f..0845cef370f91c 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/DateCommerceOptionTypeImpl.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/DateCommerceOptionTypeImpl.java
@@ -22,13 +22,13 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/NumericCommerceOptionTypeImpl.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/NumericCommerceOptionTypeImpl.java
index 89e7b88351cd24..1d709cac1cad47 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/NumericCommerceOptionTypeImpl.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/NumericCommerceOptionTypeImpl.java
@@ -22,13 +22,13 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/RadioCommerceOptionTypeImpl.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/RadioCommerceOptionTypeImpl.java
index ce8c4dd2360bac..4a59223e4a3a08 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/RadioCommerceOptionTypeImpl.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/RadioCommerceOptionTypeImpl.java
@@ -35,15 +35,15 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/SelectCommerceOptionTypeImpl.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/SelectCommerceOptionTypeImpl.java
index 9befd07fa2a146..4d8a74821fc213 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/SelectCommerceOptionTypeImpl.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/SelectCommerceOptionTypeImpl.java
@@ -35,15 +35,15 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/SelectDateCommerceOptionTypeImpl.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/SelectDateCommerceOptionTypeImpl.java
index 86b2087d47dddb..9a48940ffb0725 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/SelectDateCommerceOptionTypeImpl.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/SelectDateCommerceOptionTypeImpl.java
@@ -35,15 +35,15 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/TextCommerceOptionTypeImpl.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/TextCommerceOptionTypeImpl.java
index 8d36ba1993f73a..4f34f804447f6f 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/TextCommerceOptionTypeImpl.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/option/TextCommerceOptionTypeImpl.java
@@ -22,13 +22,13 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.PrintWriter;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/CPConfigurationListPortlet.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/CPConfigurationListPortlet.java
index 62c7a9ca55f2e1..c16477265e141a 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/CPConfigurationListPortlet.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/CPConfigurationListPortlet.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,13 +46,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Configuration Lists",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/configuration_list/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Configuration Lists",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/configuration_list/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/CPDefinitionsPortlet.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/CPDefinitionsPortlet.java
index b50d7c4dd514ee..9654cdfc2cc7bb 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/CPDefinitionsPortlet.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/CPDefinitionsPortlet.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -47,13 +47,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Products",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Products",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPConfigurationListMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPConfigurationListMVCRenderCommand.java
index 279f4110b78246..6c3a454faa898e 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPConfigurationListMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPConfigurationListMVCRenderCommand.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
"mvc.command.name=/cp_configuration_lists/add_cp_configuration_list"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPDefinitionMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPDefinitionMVCRenderCommand.java
index c46c6f83712c5f..931efeeef5ef2d 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPDefinitionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPDefinitionMVCRenderCommand.java
@@ -26,9 +26,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/add_cp_definition"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPDefinitionSpecificationOptionValueMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPDefinitionSpecificationOptionValueMVCRenderCommand.java
index bdf55bd0d8aad1..4dbf73ad8b04c1 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPDefinitionSpecificationOptionValueMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPDefinitionSpecificationOptionValueMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/add_cp_definition_specification_option_value"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPInstanceUnitOfMeasureMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPInstanceUnitOfMeasureMVCRenderCommand.java
index bd9e15e184ca39..0e5ce8e7613fdf 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPInstanceUnitOfMeasureMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/AddCPInstanceUnitOfMeasureMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/add_cp_instance_unit_of_measure"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/DuplicateCPDefinitionMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/DuplicateCPDefinitionMVCRenderCommand.java
index 38e0d44fc4c48c..c38f8ac53f026a 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/DuplicateCPDefinitionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/DuplicateCPDefinitionMVCRenderCommand.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/duplicate_cp_definition"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPAttachmentFileEntryMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPAttachmentFileEntryMVCActionCommand.java
index 24f3e6d6a2795a..61fd10c73e198d 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPAttachmentFileEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPAttachmentFileEntryMVCActionCommand.java
@@ -27,13 +27,13 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -43,7 +43,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_attachment_file_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPAttachmentFileEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPAttachmentFileEntryMVCRenderCommand.java
index 2fd30c46ca47ef..d3d360835d466a 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPAttachmentFileEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPAttachmentFileEntryMVCRenderCommand.java
@@ -25,11 +25,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Map;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Map;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
@@ -41,7 +41,7 @@
@Component(
configurationPid = "com.liferay.commerce.product.configuration.AttachmentsConfiguration",
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_attachment_file_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationEntryMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationEntryMVCActionCommand.java
index d06dc27c46247c..9095b5c03ce0c7 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationEntryMVCActionCommand.java
@@ -19,8 +19,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
"mvc.command.name=/cp_configuration_lists/edit_cp_configuration_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationEntryMVCRenderCommand.java
index 70fe9c89fe31d6..52536fcb5e52b6 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationEntryMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
"mvc.command.name=/cp_configuration_lists/edit_cp_configuration_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationListMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationListMVCRenderCommand.java
index 79fee56982f03b..ceedca5319bbe3 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationListMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationListMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
"mvc.command.name=/cp_configuration_lists/edit_cp_configuration_list"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationListQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationListQualifiersMVCActionCommand.java
index 24d5378c685014..463d6038c908fc 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationListQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPConfigurationListQualifiersMVCActionCommand.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_CONFIGURATION_LISTS,
"mvc.command.name=/cp_configuration_lists/edit_cp_configuration_list_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionCPDisplayLayoutMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionCPDisplayLayoutMVCActionCommand.java
index c5aaa453c0aa98..cce53440d4f579 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionCPDisplayLayoutMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionCPDisplayLayoutMVCActionCommand.java
@@ -30,8 +30,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,7 +41,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_cp_definition_cp_display_layout"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionCPDisplayLayoutMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionCPDisplayLayoutMVCRenderCommand.java
index b8e44a363ed244..f0b32a1c1c2f03 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionCPDisplayLayoutMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionCPDisplayLayoutMVCRenderCommand.java
@@ -22,14 +22,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_cp_definition_cp_display_layout"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionLinkMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionLinkMVCActionCommand.java
index 7bc1989f0968ba..a639bf6181b5bb 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionLinkMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionLinkMVCActionCommand.java
@@ -25,13 +25,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_link"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionLinkMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionLinkMVCRenderCommand.java
index 3cfc9ecdafbf00..a0f88180328447 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionLinkMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionLinkMVCRenderCommand.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_link"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionMVCActionCommand.java
index 19b6f3155fa916..e31443d73485d3 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionMVCActionCommand.java
@@ -80,6 +80,9 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.net.URL;
@@ -93,9 +96,6 @@
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -104,7 +104,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionMVCRenderCommand.java
index ec73ff9e495272..4ae1118edf117f 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionMVCRenderCommand.java
@@ -26,9 +26,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionRelMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionRelMVCActionCommand.java
index c1de2d6bb3a1bb..5daa7bd853a83d 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionRelMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionRelMVCActionCommand.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_option_rel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionRelMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionRelMVCRenderCommand.java
index 034dd8af9a6253..e6a07912edaa0c 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionRelMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionRelMVCRenderCommand.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_option_rel"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionValueRelMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionValueRelMVCActionCommand.java
index 0648f0d9ab1a13..02b17a03217c56 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionValueRelMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionValueRelMVCActionCommand.java
@@ -36,12 +36,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_option_value_rel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionValueRelMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionValueRelMVCRenderCommand.java
index 6977eea94456fd..daded819e44924 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionValueRelMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionOptionValueRelMVCRenderCommand.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_option_value_rel"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionSpecificationOptionValueMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionSpecificationOptionValueMVCActionCommand.java
index 45e74d650cf897..9d1be90e248370 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionSpecificationOptionValueMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionSpecificationOptionValueMVCActionCommand.java
@@ -31,15 +31,15 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -48,7 +48,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_specification_option_value"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionSpecificationOptionValueMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionSpecificationOptionValueMVCRenderCommand.java
index 5575ab84ac8f74..3f431758854bdf 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionSpecificationOptionValueMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPDefinitionSpecificationOptionValueMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_specification_option_value"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceMVCActionCommand.java
index ee319f716cd24c..f2630d8372bc8a 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceMVCActionCommand.java
@@ -58,6 +58,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
+
import java.math.BigDecimal;
import java.util.Calendar;
@@ -66,10 +70,6 @@
import java.util.Objects;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -78,7 +78,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_instance"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceMVCRenderCommand.java
index 7e8e8b2f61ab08..c2f5e7418c43eb 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_instance"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceUnitOfMeasureMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceUnitOfMeasureMVCActionCommand.java
index ffc2794f4095d9..60949267497553 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceUnitOfMeasureMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceUnitOfMeasureMVCActionCommand.java
@@ -40,15 +40,15 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
+
import java.math.BigDecimal;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -57,7 +57,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_instance_unit_of_measure"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceUnitOfMeasureMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceUnitOfMeasureMVCRenderCommand.java
index 3c25d52d92c23a..ff06f5fce80bf5 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceUnitOfMeasureMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCPInstanceUnitOfMeasureMVCRenderCommand.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_instance_unit_of_measure"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCProductExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCProductExternalReferenceCodeMVCActionCommand.java
index 200f991229c317..69b90de14af85c 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCProductExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCProductExternalReferenceCodeMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_c_product_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCProductExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCProductExternalReferenceCodeMVCRenderCommand.java
index 4d032118abeed1..c46a7d27a203cf 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCProductExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/EditCProductExternalReferenceCodeMVCRenderCommand.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_c_product_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/UploadTempAttachmentMVCActionCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/UploadTempAttachmentMVCActionCommand.java
index 356d73833fac84..5eef9df7f44275 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/UploadTempAttachmentMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/UploadTempAttachmentMVCActionCommand.java
@@ -34,16 +34,16 @@
import com.liferay.upload.UploadHandler;
import com.liferay.upload.UploadResponseHandler;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -54,7 +54,7 @@
@Component(
configurationPid = "com.liferay.commerce.product.configuration.AttachmentsConfiguration",
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/upload_temp_attachment"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/ViewCPInstancesMVCRenderCommand.java b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/ViewCPInstancesMVCRenderCommand.java
index 01cfc0acd933b7..6807930d3293c2 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/ViewCPInstancesMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/java/com/liferay/commerce/product/definitions/web/internal/portlet/action/ViewCPInstancesMVCRenderCommand.java
@@ -20,9 +20,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/view_cp_instances"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-definitions-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-definitions-web/src/main/resources/META-INF/resources/init.jsp
index e531e7a03a53b3..cd059885c9f9a9 100644
--- a/modules/apps/commerce/commerce-product-definitions-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-definitions-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -150,6 +150,8 @@ page import="com.liferay.portal.kernel.util.WebKeys" %><%@
page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@
page import="com.liferay.taglib.servlet.PipingServletResponseFactory" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.math.BigDecimal" %>
<%@ page import="java.text.NumberFormat" %>
@@ -163,8 +165,6 @@ page import="java.util.Objects" %><%@
page import="java.util.StringJoiner" %><%@
page import="java.util.TimeZone" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/build.gradle b/modules/apps/commerce/commerce-product-item-selector-web/build.gradle
index 55dfada97fa797..81dcfe84950d9e 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-item-selector-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPDefinitionItemSelectorView.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPDefinitionItemSelectorView.java
index fe355ffcc50891..3e5a3c8500df87 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPDefinitionItemSelectorView.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPDefinitionItemSelectorView.java
@@ -18,21 +18,21 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPOptionItemSelectorView.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPOptionItemSelectorView.java
index b585eca7a852e3..65b44ec35d05fe 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPOptionItemSelectorView.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPOptionItemSelectorView.java
@@ -15,21 +15,21 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPSpecificationOptionItemSelectorView.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPSpecificationOptionItemSelectorView.java
index 691f5cba859602..568f4620cd9e5f 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPSpecificationOptionItemSelectorView.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CPSpecificationOptionItemSelectorView.java
@@ -15,21 +15,21 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CommerceChannelItemSelectorView.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CommerceChannelItemSelectorView.java
index e6061efc8f1e0d..dd408f61b02ecd 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CommerceChannelItemSelectorView.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/CommerceChannelItemSelectorView.java
@@ -16,21 +16,21 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/BaseCPItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/BaseCPItemSelectorViewDisplayContext.java
index fd3d3c704e7622..c41d8c2b7fa5fc 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/BaseCPItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/BaseCPItemSelectorViewDisplayContext.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPDefinitionItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPDefinitionItemSelectorViewDisplayContext.java
index 14541e0153deac..7f7cea01fe5c50 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPDefinitionItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPDefinitionItemSelectorViewDisplayContext.java
@@ -25,16 +25,16 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPDefinitionItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPDefinitionItemSelectorViewManagementToolbarDisplayContext.java
index 7654e6ab571f77..3607115fd96d15 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPDefinitionItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPDefinitionItemSelectorViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPOptionItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPOptionItemSelectorViewDisplayContext.java
index ae1ea78e5f5ca7..bfd4d94ef8ed90 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPOptionItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPOptionItemSelectorViewDisplayContext.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.dao.search.SearchContainer;
import com.liferay.portal.kernel.exception.PortalException;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPOptionItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPOptionItemSelectorViewManagementToolbarDisplayContext.java
index 9e907b1cfc1240..b03c24851c67fd 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPOptionItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPOptionItemSelectorViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPSpecificationOptionItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPSpecificationOptionItemSelectorViewDisplayContext.java
index b0aefe17b28433..f86cb776563442 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPSpecificationOptionItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPSpecificationOptionItemSelectorViewDisplayContext.java
@@ -11,9 +11,9 @@
import com.liferay.portal.kernel.dao.search.SearchContainer;
import com.liferay.portal.kernel.exception.PortalException;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPSpecificationOptionItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPSpecificationOptionItemSelectorViewManagementToolbarDisplayContext.java
index 00b252b59f3d21..7114d9bd479391 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPSpecificationOptionItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CPSpecificationOptionItemSelectorViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CommerceChannelItemSelectorViewDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CommerceChannelItemSelectorViewDisplayContext.java
index 8e042420206f18..04d4134e2d12b5 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CommerceChannelItemSelectorViewDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CommerceChannelItemSelectorViewDisplayContext.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CommerceChannelsItemSelectorViewManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CommerceChannelsItemSelectorViewManagementToolbarDisplayContext.java
index 1b6dc63cfb0325..9eb35b8e5f57a2 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CommerceChannelsItemSelectorViewManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/display/context/CommerceChannelsItemSelectorViewManagementToolbarDisplayContext.java
@@ -12,7 +12,7 @@
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/search/CPDefinitionItemSelectorChecker.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/search/CPDefinitionItemSelectorChecker.java
index 4e59fa7c265d3f..3dfde7740ef5c4 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/search/CPDefinitionItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/search/CPDefinitionItemSelectorChecker.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.SetUtil;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/search/CommerceChannelItemSelectorChecker.java b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/search/CommerceChannelItemSelectorChecker.java
index 86fb686f5c1f2d..8895d2e4732ffe 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/search/CommerceChannelItemSelectorChecker.java
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/java/com/liferay/commerce/product/item/selector/web/internal/search/CommerceChannelItemSelectorChecker.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.dao.search.EmptyOnClickRowChecker;
import com.liferay.portal.kernel.util.SetUtil;
-import java.util.Set;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderResponse;
+import java.util.Set;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-item-selector-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-item-selector-web/src/main/resources/META-INF/resources/init.jsp
index f0888d0133b245..d5dcc1f1b65e26 100644
--- a/modules/apps/commerce/commerce-product-item-selector-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-item-selector-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-product-measurement-unit-web/build.gradle b/modules/apps/commerce/commerce-product-measurement-unit-web/build.gradle
index 79a06fa738e105..94430d04ab4ff1 100644
--- a/modules/apps/commerce/commerce-product-measurement-unit-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-measurement-unit-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:commerce:commerce-application-list")
diff --git a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/application/list/CommerceMeasurementUnitPanelApp.java b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/application/list/CommerceMeasurementUnitPanelApp.java
index e4ec7933ef4375..aa6cb4de05555d 100644
--- a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/application/list/CommerceMeasurementUnitPanelApp.java
+++ b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/application/list/CommerceMeasurementUnitPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.CP_MEASUREMENT_UNIT + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.CP_MEASUREMENT_UNIT + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/display/context/CPMeasurementUnitsDisplayContext.java b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/display/context/CPMeasurementUnitsDisplayContext.java
index 6bba65414ee1bf..e978bf95b41760 100644
--- a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/display/context/CPMeasurementUnitsDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/display/context/CPMeasurementUnitsDisplayContext.java
@@ -27,14 +27,14 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/display/context/CPMeasurementUnitsManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/display/context/CPMeasurementUnitsManagementToolbarDisplayContext.java
index 01886fd028b64b..18af7dd0954fcb 100644
--- a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/display/context/CPMeasurementUnitsManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/display/context/CPMeasurementUnitsManagementToolbarDisplayContext.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/CPMeasurementUnitPortlet.java b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/CPMeasurementUnitPortlet.java
index d640e9b6101e82..2a680e42839b94 100644
--- a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/CPMeasurementUnitPortlet.java
+++ b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/CPMeasurementUnitPortlet.java
@@ -13,12 +13,12 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,13 +38,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Measurement Units",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_MEASUREMENT_UNIT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Measurement Units",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_MEASUREMENT_UNIT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/action/EditCPMeasurementUnitMVCActionCommand.java b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/action/EditCPMeasurementUnitMVCActionCommand.java
index e9a09274d7e772..133c64029e99c4 100644
--- a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/action/EditCPMeasurementUnitMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/action/EditCPMeasurementUnitMVCActionCommand.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_MEASUREMENT_UNIT,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_MEASUREMENT_UNIT,
"mvc.command.name=/cp_measurement_unit/edit_cp_measurement_unit"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/action/EditCPMeasurementUnitMVCRenderCommand.java b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/action/EditCPMeasurementUnitMVCRenderCommand.java
index 8aa3d543824b28..23b84e8f9d1e54 100644
--- a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/action/EditCPMeasurementUnitMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/java/com/liferay/commerce/product/measurement/unit/web/internal/portlet/action/EditCPMeasurementUnitMVCRenderCommand.java
@@ -14,10 +14,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_MEASUREMENT_UNIT,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_MEASUREMENT_UNIT,
"mvc.command.name=/cp_measurement_unit/edit_cp_measurement_unit"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/resources/META-INF/resources/init.jsp
index 61662673249aa6..0c50ce5743055f 100644
--- a/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-measurement-unit-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-product-options-web/build.gradle b/modules/apps/commerce/commerce-product-options-web/build.gradle
index 63a9dbe3e91fba..c88c38cd1b5aef 100644
--- a/modules/apps/commerce/commerce-product-options-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-options-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:commerce:commerce-application-list")
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/application/list/CPOptionsPanelApp.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/application/list/CPOptionsPanelApp.java
index 3ae99c9360e8ac..6108a34c2bb916 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/application/list/CPOptionsPanelApp.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/application/list/CPOptionsPanelApp.java
@@ -36,7 +36,9 @@ public String getPortletId() {
return CPPortletKeys.CP_OPTIONS;
}
- @Reference(target = "(javax.portlet.name=" + CPPortletKeys.CP_OPTIONS + ")")
+ @Reference(
+ target = "(jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS + ")"
+ )
private Portlet _portlet;
}
\ No newline at end of file
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/application/list/CPSpecificationOptionsPanelApp.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/application/list/CPSpecificationOptionsPanelApp.java
index f506d444d42f02..7f1027cd946277 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/application/list/CPSpecificationOptionsPanelApp.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/application/list/CPSpecificationOptionsPanelApp.java
@@ -48,7 +48,7 @@ public String getPortletId() {
private Language _language;
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/custom/attributes/CPOptionCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/custom/attributes/CPOptionCustomAttributesDisplay.java
index 3b5f69de465e47..a686114907cd55 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/custom/attributes/CPOptionCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/custom/attributes/CPOptionCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
service = CustomAttributesDisplay.class
)
public class CPOptionCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/custom/attributes/CPOptionValueCustomAttributesDisplay.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/custom/attributes/CPOptionValueCustomAttributesDisplay.java
index 0846c2693c129d..9148fd605358ee 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/custom/attributes/CPOptionValueCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/custom/attributes/CPOptionValueCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ property = "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
service = CustomAttributesDisplay.class
)
public class CPOptionValueCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/BaseCPOptionsDisplayContext.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/BaseCPOptionsDisplayContext.java
index f09e64b2f2b150..2a37471f5dd61d 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/BaseCPOptionsDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/BaseCPOptionsDisplayContext.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionCategoryDisplayContext.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionCategoryDisplayContext.java
index 1e60ae4ad3104f..aa9d40519f9ff7 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionCategoryDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionCategoryDisplayContext.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionCategoryManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionCategoryManagementToolbarDisplayContext.java
index 55f1c2ace7f91b..a57a0600db3e80 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionCategoryManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionCategoryManagementToolbarDisplayContext.java
@@ -18,9 +18,9 @@
import com.liferay.portal.kernel.portlet.LiferayPortletRequest;
import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionDisplayContext.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionDisplayContext.java
index 5852884f841268..f59499b5c17f4f 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPOptionDisplayContext.java
@@ -24,16 +24,16 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.settings.SystemSettingsLocator;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.WindowStateException;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowStateException;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPSpecificationOptionDisplayContext.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPSpecificationOptionDisplayContext.java
index b92b1f1e3698c1..450095b127826b 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPSpecificationOptionDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPSpecificationOptionDisplayContext.java
@@ -30,12 +30,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPSpecificationOptionManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPSpecificationOptionManagementToolbarDisplayContext.java
index 0b82839246987a..105839ff15a089 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPSpecificationOptionManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/display/context/CPSpecificationOptionManagementToolbarDisplayContext.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Eudaldo Alonso
*/
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/data/set/provider/CommerceSpecificationOptionListTypeDefinitionFDSActionProvider.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/data/set/provider/CommerceSpecificationOptionListTypeDefinitionFDSActionProvider.java
index d858bc972ad783..6a3aba38c6109c 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/data/set/provider/CommerceSpecificationOptionListTypeDefinitionFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/data/set/provider/CommerceSpecificationOptionListTypeDefinitionFDSActionProvider.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Arrays;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/data/set/provider/CommerceSpecificationOptionListTypeDefinitionFDSDataProvider.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/data/set/provider/CommerceSpecificationOptionListTypeDefinitionFDSDataProvider.java
index 6ebd4853d6fd1d..35729507923e37 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/data/set/provider/CommerceSpecificationOptionListTypeDefinitionFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/data/set/provider/CommerceSpecificationOptionListTypeDefinitionFDSDataProvider.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPOptionCategoryDetailsFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPOptionCategoryDetailsFormNavigatorEntry.java
index e572228d2fc193..09a86f4bd9b358 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPOptionCategoryDetailsFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPOptionCategoryDetailsFormNavigatorEntry.java
@@ -11,9 +11,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPSpecificationOptionDetailsCustomFieldsFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPSpecificationOptionDetailsCustomFieldsFormNavigatorEntry.java
index e9143f40a8a197..22c47507d92ed2 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPSpecificationOptionDetailsCustomFieldsFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPSpecificationOptionDetailsCustomFieldsFormNavigatorEntry.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.taglib.util.CustomAttributesUtil;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPSpecificationOptionDetailsFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPSpecificationOptionDetailsFormNavigatorEntry.java
index 528715bf46738a..dc0ceeaf5ab3f0 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPSpecificationOptionDetailsFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/frontend/taglib/form/navigator/CPSpecificationOptionDetailsFormNavigatorEntry.java
@@ -11,9 +11,9 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
-import java.util.Locale;
+import jakarta.servlet.ServletContext;
-import javax.servlet.ServletContext;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/CPOptionsPortlet.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/CPOptionsPortlet.java
index 372658334dfe8c..417890173e4f98 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/CPOptionsPortlet.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/CPOptionsPortlet.java
@@ -13,12 +13,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,13 +39,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Options",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Options",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/CPSpecificationOptionsPortlet.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/CPSpecificationOptionsPortlet.java
index d01f1d3f1d5d6c..4b27b42846ea7d 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/CPSpecificationOptionsPortlet.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/CPSpecificationOptionsPortlet.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,13 +44,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Specifications",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view_cp_specification_options.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Specifications",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view_cp_specification_options.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPOptionMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPOptionMVCRenderCommand.java
index 4b77cb5e38da42..cdddad21784b4f 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPOptionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPOptionMVCRenderCommand.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -25,7 +25,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/add_cp_option"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPOptionValueMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPOptionValueMVCRenderCommand.java
index 7ee8de2dc2dcab..782dca84a5cd86 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPOptionValueMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPOptionValueMVCRenderCommand.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/add_cp_option_value"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPSpecificationOptionListTypeDefinitionMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPSpecificationOptionListTypeDefinitionMVCRenderCommand.java
index abaef26e05319a..710de322a5054a 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPSpecificationOptionListTypeDefinitionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/AddCPSpecificationOptionListTypeDefinitionMVCRenderCommand.java
@@ -10,9 +10,9 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -21,7 +21,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
"mvc.command.name=/cp_specification_options/add_cp_specification_option_list_type_definition"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPOptionCategoryInfoPanelMVCResourceCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPOptionCategoryInfoPanelMVCResourceCommand.java
index 866f0e9d3deced..11ea2acc1b2664 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPOptionCategoryInfoPanelMVCResourceCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPOptionCategoryInfoPanelMVCResourceCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.BaseMVCResourceCommand;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCResourceCommand;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
"mvc.command.name=/cp_specification_options/cp_option_category_info_panel"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPOptionValuesMVCResourceCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPOptionValuesMVCResourceCommand.java
index 8797bb14315338..64998480bd5b93 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPOptionValuesMVCResourceCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPOptionValuesMVCResourceCommand.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/cp_option_values"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPSpecificationOptionInfoPanelMVCResourceCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPSpecificationOptionInfoPanelMVCResourceCommand.java
index 2bd3a30c643701..670123c7b1c6b5 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPSpecificationOptionInfoPanelMVCResourceCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/CPSpecificationOptionInfoPanelMVCResourceCommand.java
@@ -11,8 +11,8 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.BaseMVCResourceCommand;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCResourceCommand;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -22,7 +22,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
"mvc.command.name=/cp_specification_options/cp_specification_option_info_panel"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionCategoryMVCActionCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionCategoryMVCActionCommand.java
index 268a8d28ce346a..d12ca9be541611 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionCategoryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionCategoryMVCActionCommand.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
"mvc.command.name=/cp_specification_options/edit_cp_option_category"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionCategoryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionCategoryMVCRenderCommand.java
index 1c166d3b65a67b..b0b7a724b60e0b 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionCategoryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionCategoryMVCRenderCommand.java
@@ -25,10 +25,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
"mvc.command.name=/cp_specification_options/edit_cp_option_category"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionExternalReferenceCodeMVCActionCommand.java
index 696e8bec2fbbde..e11c697b8eec62 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionExternalReferenceCodeMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/edit_cp_option_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionExternalReferenceCodeMVCRenderCommand.java
index 5d64ca5a1239ec..16b95e91481535 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionExternalReferenceCodeMVCRenderCommand.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/edit_cp_option_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionMVCActionCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionMVCActionCommand.java
index d774b54731d626..9e3e145d72f5d4 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionMVCActionCommand.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/edit_cp_option"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionMVCRenderCommand.java
index 3307f87667a17c..4806d104d1eba2 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionMVCRenderCommand.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/edit_cp_option"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionValueMVCActionCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionValueMVCActionCommand.java
index 2413d207b90b9f..cd064d12d7332f 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionValueMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionValueMVCActionCommand.java
@@ -26,12 +26,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/edit_cp_option_value"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionValueMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionValueMVCRenderCommand.java
index bfcd46ef65ac9e..74894a7e7c9369 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionValueMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPOptionValueMVCRenderCommand.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_OPTIONS,
"mvc.command.name=/cp_options/edit_cp_option_value"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPSpecificationOptionMVCActionCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPSpecificationOptionMVCActionCommand.java
index a78d1d72c7f5c2..74cc43d375a105 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPSpecificationOptionMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPSpecificationOptionMVCActionCommand.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
"mvc.command.name=/cp_specification_options/edit_cp_specification_option"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPSpecificationOptionMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPSpecificationOptionMVCRenderCommand.java
index c3cf34658980f5..89ed3155a9542d 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPSpecificationOptionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/EditCPSpecificationOptionMVCRenderCommand.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
"mvc.command.name=/cp_specification_options/edit_cp_specification_option"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/ViewCPOptionCategoriesMVCRenderCommand.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/ViewCPOptionCategoriesMVCRenderCommand.java
index ea0553025b4839..c3d75d74fdc05b 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/ViewCPOptionCategoriesMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/ViewCPOptionCategoriesMVCRenderCommand.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_SPECIFICATION_OPTIONS,
"mvc.command.name=/cp_specification_options/view_cp_option_categories"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/helper/ActionHelper.java b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/helper/ActionHelper.java
index 0fa2c353a59be5..fdace4b98b262d 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/helper/ActionHelper.java
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/java/com/liferay/commerce/product/options/web/internal/portlet/action/helper/ActionHelper.java
@@ -17,12 +17,12 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.ResourceRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.RenderRequest;
-import javax.portlet.ResourceRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-options-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-options-web/src/main/resources/META-INF/resources/init.jsp
index f41a8ec800a795..9f291939e9d549 100644
--- a/modules/apps/commerce/commerce-product-options-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-options-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -67,6 +67,8 @@ page import="com.liferay.portal.kernel.util.ParamUtil" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %><%@
page import="com.liferay.taglib.util.CustomAttributesUtil" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.util.ArrayList" %><%@
page import="java.util.Calendar" %><%@
page import="java.util.Collections" %><%@
@@ -76,8 +78,6 @@ page import="java.util.Locale" %><%@
page import="java.util.Set" %><%@
page import="java.util.TimeZone" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-product-service/build.gradle b/modules/apps/commerce/commerce-product-service/build.gradle
index 9b459d60822aea..6559c868207650 100644
--- a/modules/apps/commerce/commerce-product-service/build.gradle
+++ b/modules/apps/commerce/commerce-product-service/build.gradle
@@ -4,13 +4,13 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay", name: "org.springframework.tx", version: "5.3.39.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/BaseAssetEntryCPDataSourceImpl.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/BaseAssetEntryCPDataSourceImpl.java
index 7930285a20c237..517a683b1296d0 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/BaseAssetEntryCPDataSourceImpl.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/BaseAssetEntryCPDataSourceImpl.java
@@ -19,14 +19,14 @@
import com.liferay.portal.kernel.util.ResourceBundleUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Reference;
/**
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/CSDiagramEntryCPDataSourceImpl.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/CSDiagramEntryCPDataSourceImpl.java
index 556d6eb98fc3fa..2af659ede704c2 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/CSDiagramEntryCPDataSourceImpl.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/CSDiagramEntryCPDataSourceImpl.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.security.permission.PermissionThreadLocal;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/DefinitionLinkTypeCPDataSourceImpl.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/DefinitionLinkTypeCPDataSourceImpl.java
index ea9b11469683a3..7a76f4b5d471e0 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/DefinitionLinkTypeCPDataSourceImpl.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/data/source/DefinitionLinkTypeCPDataSourceImpl.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.search.SearchContext;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Modified;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/importer/CPFileImporterImpl.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/importer/CPFileImporterImpl.java
index edac2e8441ff7b..128968fcddaa7f 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/importer/CPFileImporterImpl.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/importer/CPFileImporterImpl.java
@@ -75,6 +75,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.model.impl.ThemeSettingImpl;
+import jakarta.portlet.PortletPreferences;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -90,8 +92,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.portlet.PortletPreferences;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/portlet/action/ActionHelperImpl.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/portlet/action/ActionHelperImpl.java
index ae63b99bcdbdcd..152a86d1bca0c6 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/portlet/action/ActionHelperImpl.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/portlet/action/ActionHelperImpl.java
@@ -31,16 +31,16 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPAttachmentFileEntryIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPAttachmentFileEntryIndexer.java
index 981a9f1eea4858..1cf34362a5a5da 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPAttachmentFileEntryIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPAttachmentFileEntryIndexer.java
@@ -35,15 +35,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDefinitionOptionRelIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDefinitionOptionRelIndexer.java
index 90029be7058973..e5c6377280d3b8 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDefinitionOptionRelIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDefinitionOptionRelIndexer.java
@@ -26,14 +26,14 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDefinitionOptionValueRelIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDefinitionOptionValueRelIndexer.java
index 24187f63aa8360..ce1eada8594d6f 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDefinitionOptionValueRelIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDefinitionOptionValueRelIndexer.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.LinkedHashMap;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDisplayLayoutIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDisplayLayoutIndexer.java
index e666b4f71fb33c..822b9692b87435 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDisplayLayoutIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPDisplayLayoutIndexer.java
@@ -35,14 +35,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.io.Serializable;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionCategoryIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionCategoryIndexer.java
index 4196c8dd90a722..84688c172fe636 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionCategoryIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionCategoryIndexer.java
@@ -23,10 +23,10 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Localization;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionIndexer.java
index d5b1b660ff3c84..6f476bddc0f20c 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionIndexer.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.LinkedHashMap;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionValueIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionValueIndexer.java
index 93d7314508fbf5..e2b3825c280103 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionValueIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPOptionValueIndexer.java
@@ -23,10 +23,10 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Localization;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPSpecificationOptionIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPSpecificationOptionIndexer.java
index 6d56ddc4664889..5e12495ae32ddd 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPSpecificationOptionIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CPSpecificationOptionIndexer.java
@@ -27,15 +27,15 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CommerceCatalogIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CommerceCatalogIndexer.java
index 2156e7d0c57cde..02694ba01f67c2 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CommerceCatalogIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CommerceCatalogIndexer.java
@@ -25,10 +25,10 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CommerceChannelIndexer.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CommerceChannelIndexer.java
index 8d1516326d663c..5f598784813bf2 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CommerceChannelIndexer.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/search/CommerceChannelIndexer.java
@@ -26,10 +26,10 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/upgrade/registry/CommerceProductServiceUpgradeStepRegistrator.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/upgrade/registry/CommerceProductServiceUpgradeStepRegistrator.java
index bb1cacf820efa4..cb92a97714a876 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/upgrade/registry/CommerceProductServiceUpgradeStepRegistrator.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/upgrade/registry/CommerceProductServiceUpgradeStepRegistrator.java
@@ -65,7 +65,7 @@
import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
import com.liferay.portlet.display.template.upgrade.BaseUpgradePortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/util/CPDefinitionLocalServiceCircularDependencyUtil.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/util/CPDefinitionLocalServiceCircularDependencyUtil.java
index 45230aeb705e39..df3bcc76136d99 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/util/CPDefinitionLocalServiceCircularDependencyUtil.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/internal/util/CPDefinitionLocalServiceCircularDependencyUtil.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.module.service.Snapshot;
import com.liferay.portal.kernel.service.ServiceContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Lily Chi
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/service/impl/CPDefinitionLocalServiceImpl.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/service/impl/CPDefinitionLocalServiceImpl.java
index a6a9f3c8fde724..e0cfe1d302d000 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/service/impl/CPDefinitionLocalServiceImpl.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/service/impl/CPDefinitionLocalServiceImpl.java
@@ -136,6 +136,8 @@
import com.liferay.portal.kernel.workflow.WorkflowConstants;
import com.liferay.portal.kernel.workflow.WorkflowHandlerRegistryUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -152,8 +154,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/service/impl/CPDefinitionOptionRelLocalServiceImpl.java b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/service/impl/CPDefinitionOptionRelLocalServiceImpl.java
index 98c1b64b0e856f..2b618520a71df9 100644
--- a/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/service/impl/CPDefinitionOptionRelLocalServiceImpl.java
+++ b/modules/apps/commerce/commerce-product-service/src/main/java/com/liferay/commerce/product/service/impl/CPDefinitionOptionRelLocalServiceImpl.java
@@ -65,6 +65,8 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -77,8 +79,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-subscription-type-web/build.gradle b/modules/apps/commerce/commerce-product-subscription-type-web/build.gradle
index 5796d640f426fc..f3ad7a5e39ea6f 100644
--- a/modules/apps/commerce/commerce-product-subscription-type-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-subscription-type-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/MonthlyCPSubscriptionTypeJSPContributor.java b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/MonthlyCPSubscriptionTypeJSPContributor.java
index deb1f16a171044..a303b5fb091667 100644
--- a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/MonthlyCPSubscriptionTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/MonthlyCPSubscriptionTypeJSPContributor.java
@@ -10,9 +10,9 @@
import com.liferay.commerce.product.util.CPSubscriptionTypeJSPContributor;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/WeeklyCPSubscriptionTypeJSPContributor.java b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/WeeklyCPSubscriptionTypeJSPContributor.java
index 6689e997cdf9d4..4a82427ce5ae46 100644
--- a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/WeeklyCPSubscriptionTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/WeeklyCPSubscriptionTypeJSPContributor.java
@@ -10,9 +10,9 @@
import com.liferay.commerce.product.util.CPSubscriptionTypeJSPContributor;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/YearlyCPSubscriptionTypeJSPContributor.java b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/YearlyCPSubscriptionTypeJSPContributor.java
index ffda3628242b36..ce60559afb6239 100644
--- a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/YearlyCPSubscriptionTypeJSPContributor.java
+++ b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/YearlyCPSubscriptionTypeJSPContributor.java
@@ -10,9 +10,9 @@
import com.liferay.commerce.product.util.CPSubscriptionTypeJSPContributor;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/WeeklyCPSubscriptionTypeDisplayContext.java b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/WeeklyCPSubscriptionTypeDisplayContext.java
index b721a4da509f16..e06d904dc174d4 100644
--- a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/WeeklyCPSubscriptionTypeDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/WeeklyCPSubscriptionTypeDisplayContext.java
@@ -13,13 +13,13 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/YearlyCPSubscriptionTypeDisplayContext.java b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/YearlyCPSubscriptionTypeDisplayContext.java
index 669f0afacef85f..1d2841489de1a5 100644
--- a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/YearlyCPSubscriptionTypeDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/YearlyCPSubscriptionTypeDisplayContext.java
@@ -14,13 +14,13 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/helper/CPSubscriptionTypeRequestHelper.java b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/helper/CPSubscriptionTypeRequestHelper.java
index 6fc3116472c7da..e869a24f67afe7 100644
--- a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/helper/CPSubscriptionTypeRequestHelper.java
+++ b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/java/com/liferay/commerce/product/subscription/type/web/internal/display/context/helper/CPSubscriptionTypeRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/resources/META-INF/resources/init.jsp
index 87e3efa7caf290..d30ebca162aede 100644
--- a/modules/apps/commerce/commerce-product-subscription-type-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-subscription-type-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-product-taglib/build.gradle b/modules/apps/commerce/commerce-product-taglib/build.gradle
index 55469c3e572d3e..35f7c30cb9af33 100644
--- a/modules/apps/commerce/commerce-product-taglib/build.gradle
+++ b/modules/apps/commerce/commerce-product-taglib/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-product-api")
diff --git a/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/ProductListEntryRendererTag.java b/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/ProductListEntryRendererTag.java
index a798f300461cac..3a7734f60d1bf0 100644
--- a/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/ProductListEntryRendererTag.java
+++ b/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/ProductListEntryRendererTag.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.util.Map;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/ProductListRendererTag.java b/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/ProductListRendererTag.java
index 27e8331151e4d3..6b6f9d75ebe383 100644
--- a/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/ProductListRendererTag.java
+++ b/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/ProductListRendererTag.java
@@ -13,11 +13,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.taglib.util.IncludeTag;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.util.Map;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/internal/servlet/ServletContextUtil.java b/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/internal/servlet/ServletContextUtil.java
index 493c66ed432f5f..97d77ff3a8139e 100644
--- a/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/internal/servlet/ServletContextUtil.java
+++ b/modules/apps/commerce/commerce-product-taglib/src/main/java/com/liferay/commerce/product/taglib/servlet/taglib/internal/servlet/ServletContextUtil.java
@@ -10,7 +10,7 @@
import com.liferay.commerce.product.content.render.list.entry.CPContentListEntryRendererRegistry;
import com.liferay.portal.kernel.module.service.Snapshot;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/build.gradle b/modules/apps/commerce/commerce-product-tax-category-web/build.gradle
index 37accc400bb4f0..c5e993da3325c9 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-tax-category-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:application-list:application-list-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/application/list/CommerceTaxCategoryPanelApp.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/application/list/CommerceTaxCategoryPanelApp.java
index 98bb75d48146d6..ee476e22fec045 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/application/list/CommerceTaxCategoryPanelApp.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/application/list/CommerceTaxCategoryPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/display/context/CPTaxCategoryDisplayContext.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/display/context/CPTaxCategoryDisplayContext.java
index deb93461b8605a..f64a0829e5539e 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/display/context/CPTaxCategoryDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/display/context/CPTaxCategoryDisplayContext.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/display/context/CPTaxCategoryManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/display/context/CPTaxCategoryManagementToolbarDisplayContext.java
index f1ac37d003555b..01a20c8396d092 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/display/context/CPTaxCategoryManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/display/context/CPTaxCategoryManagementToolbarDisplayContext.java
@@ -19,9 +19,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/CPTaxCategoryPortlet.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/CPTaxCategoryPortlet.java
index 3d8fa8d36aa06f..1cb959109a0a42 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/CPTaxCategoryPortlet.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/CPTaxCategoryPortlet.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,13 +39,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Tax Categories",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Tax Categories",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/AddCPTaxCategoryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/AddCPTaxCategoryMVCRenderCommand.java
index adcd5d6eb50c5b..f92c1eeb54e2ee 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/AddCPTaxCategoryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/AddCPTaxCategoryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
"mvc.command.name=/cp_tax_category/add_cp_tax_category"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryExternalReferenceCodeMVCActionCommand.java
index efca812408a0c2..4f622b554afdeb 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryExternalReferenceCodeMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
"mvc.command.name=/cp_tax_category/edit_cp_tax_category_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryExternalReferenceCodeMVCRenderCommand.java
index 0f302ac49764b9..f2aa4694c062fe 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryExternalReferenceCodeMVCRenderCommand.java
@@ -14,9 +14,9 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -26,7 +26,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
"mvc.command.name=/cp_tax_category/edit_cp_tax_category_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryMVCActionCommand.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryMVCActionCommand.java
index a3cc41f7882b86..ae7a47fdd3cb36 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryMVCActionCommand.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
"mvc.command.name=/cp_tax_category/edit_cp_tax_category"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryMVCRenderCommand.java
index 86bc5317a15067..d8b5cd9f572cd7 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/java/com/liferay/commerce/product/tax/category/web/internal/portlet/action/EditCPTaxCategoryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_TAX_CATEGORY,
"mvc.command.name=/cp_tax_category/edit_cp_tax_category"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-tax-category-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-tax-category-web/src/main/resources/META-INF/resources/init.jsp
index 1634b5fc91c1b4..24524e8bbc37e1 100644
--- a/modules/apps/commerce/commerce-product-tax-category-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-tax-category-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-product-test/build.gradle b/modules/apps/commerce/commerce-product-test/build.gradle
index f8c06fda4e7b0d..72c47b698abac6 100644
--- a/modules/apps/commerce/commerce-product-test/build.gradle
+++ b/modules/apps/commerce/commerce-product-test/build.gradle
@@ -1,8 +1,8 @@
dependencies {
testIntegrationImplementation group: "com.github.ignaciotcrespo", name: "frutilla", version: "0.7.1"
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- testIntegrationImplementation group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ testIntegrationImplementation group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
testIntegrationImplementation group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
testIntegrationImplementation group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
testIntegrationImplementation project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-product-test/src/testIntegration/java/com/liferay/commerce/product/internal/health/status/test/CPConfigurationListEligibilityCommerceHealthStatusTest.java b/modules/apps/commerce/commerce-product-test/src/testIntegration/java/com/liferay/commerce/product/internal/health/status/test/CPConfigurationListEligibilityCommerceHealthStatusTest.java
index 97a1485bcb4c0e..b0828f1b4f9371 100644
--- a/modules/apps/commerce/commerce-product-test/src/testIntegration/java/com/liferay/commerce/product/internal/health/status/test/CPConfigurationListEligibilityCommerceHealthStatusTest.java
+++ b/modules/apps/commerce/commerce-product-test/src/testIntegration/java/com/liferay/commerce/product/internal/health/status/test/CPConfigurationListEligibilityCommerceHealthStatusTest.java
@@ -48,11 +48,11 @@
import com.liferay.portal.test.rule.Inject;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
import org.junit.Assert;
import org.junit.ClassRule;
import org.junit.Rule;
diff --git a/modules/apps/commerce/commerce-product-type-grouped-service/build.gradle b/modules/apps/commerce/commerce-product-type-grouped-service/build.gradle
index 16d958d3e4fe31..e8ace62a36331c 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-service/build.gradle
+++ b/modules/apps/commerce/commerce-product-type-grouped-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-product-api")
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/build.gradle b/modules/apps/commerce/commerce-product-type-grouped-web/build.gradle
index 7129b0de29bb1f..aa642476a209fb 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-cart-taglib")
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/display/context/CPDefinitionGroupedEntriesDisplayContext.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/display/context/CPDefinitionGroupedEntriesDisplayContext.java
index 09739f0e5f75b7..c32e855a09cd1a 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/display/context/CPDefinitionGroupedEntriesDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/display/context/CPDefinitionGroupedEntriesDisplayContext.java
@@ -31,16 +31,16 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Di Giorgi
*/
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/display/context/CPDefinitionGroupedManagementToolbarDisplayContext.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/display/context/CPDefinitionGroupedManagementToolbarDisplayContext.java
index c8ed1d92747586..3056f579e52831 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/display/context/CPDefinitionGroupedManagementToolbarDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/display/context/CPDefinitionGroupedManagementToolbarDisplayContext.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
/**
* @author Eudaldo Alonso
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/frontend/taglib/servlet/taglib/CPDefinitionCPTypeGroupedScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/frontend/taglib/servlet/taglib/CPDefinitionCPTypeGroupedScreenNavigationEntry.java
index 79ce7dd39895f3..f9054e654e7e04 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/frontend/taglib/servlet/taglib/CPDefinitionCPTypeGroupedScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/frontend/taglib/servlet/taglib/CPDefinitionCPTypeGroupedScreenNavigationEntry.java
@@ -17,11 +17,11 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/CPDefinitionGroupedEntryInfoPanelMVCResourceCommand.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/CPDefinitionGroupedEntryInfoPanelMVCResourceCommand.java
index fc4afecb45f2f4..5610679e55e5a6 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/CPDefinitionGroupedEntryInfoPanelMVCResourceCommand.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/CPDefinitionGroupedEntryInfoPanelMVCResourceCommand.java
@@ -13,12 +13,12 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCResourceCommand;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/cp_definition_grouped_entry_info_panel"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/EditCPDefinitionGroupedEntryMVCActionCommand.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/EditCPDefinitionGroupedEntryMVCActionCommand.java
index 3b674241245af2..2c0ff4fa4936fa 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/EditCPDefinitionGroupedEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/EditCPDefinitionGroupedEntryMVCActionCommand.java
@@ -16,8 +16,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_grouped_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/EditCPDefinitionGroupedEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/EditCPDefinitionGroupedEntryMVCRenderCommand.java
index ba5d812943ca00..c5342b5a913947 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/EditCPDefinitionGroupedEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/EditCPDefinitionGroupedEntryMVCRenderCommand.java
@@ -15,14 +15,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_grouped_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/ViewCPDefinitionGroupedEntriesMVCRenderCommand.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/ViewCPDefinitionGroupedEntriesMVCRenderCommand.java
index c748c51e7aba3a..8bd75486a79283 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/ViewCPDefinitionGroupedEntriesMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/action/ViewCPDefinitionGroupedEntriesMVCRenderCommand.java
@@ -15,14 +15,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -32,7 +32,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/view_cp_definition_grouped_entries"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/template/GroupedCPTypeTemplateContextContributor.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/template/GroupedCPTypeTemplateContextContributor.java
index 3236688ee9e1b6..7e8b2d7689310f 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/template/GroupedCPTypeTemplateContextContributor.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/portlet/template/GroupedCPTypeTemplateContextContributor.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.type.grouped.util.GroupedCPTypeHelper;
import com.liferay.portal.kernel.template.TemplateContextContributor;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/servlet/taglib/GroupedCPTypeJSPDynamicInclude.java b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/servlet/taglib/GroupedCPTypeJSPDynamicInclude.java
index 855065719d2225..7d9bb7a6729897 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/servlet/taglib/GroupedCPTypeJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/java/com/liferay/commerce/product/type/grouped/web/internal/servlet/taglib/GroupedCPTypeJSPDynamicInclude.java
@@ -12,11 +12,11 @@
import com.liferay.portal.kernel.servlet.taglib.BaseJSPDynamicInclude;
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/resources/META-INF/resources/init.jsp
index ea05d19187ac5b..4ebe378f890856 100644
--- a/modules/apps/commerce/commerce-product-type-grouped-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-type-grouped-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -46,11 +46,11 @@ page import="com.liferay.portal.kernel.util.ParamUtil" %><%@
page import="com.liferay.portal.kernel.util.PortalUtil" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.util.Collections" %><%@
page import="java.util.List" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-product-type-simple/build.gradle b/modules/apps/commerce/commerce-product-type-simple/build.gradle
index 81732769ccc833..9f2dc8ac51b3c7 100644
--- a/modules/apps/commerce/commerce-product-type-simple/build.gradle
+++ b/modules/apps/commerce/commerce-product-type-simple/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-product-api")
}
\ No newline at end of file
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/build.gradle b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/build.gradle
index bec95bc22f5511..c7978e7e4232fd 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/display/context/CommerceVirtualOrderItemContentDisplayContext.java b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/display/context/CommerceVirtualOrderItemContentDisplayContext.java
index 4abf42ed97f5b8..f02dc5a4c6c489 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/display/context/CommerceVirtualOrderItemContentDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/display/context/CommerceVirtualOrderItemContentDisplayContext.java
@@ -42,13 +42,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.List;
-import java.util.Locale;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.ResourceURL;
-import javax.portlet.PortletURL;
-import javax.portlet.ResourceURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/display/context/helper/CommerceVirtualOrderItemContentRequestHelper.java b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/display/context/helper/CommerceVirtualOrderItemContentRequestHelper.java
index ecfa3e707cf457..938f6d76c17a4d 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/display/context/helper/CommerceVirtualOrderItemContentRequestHelper.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/display/context/helper/CommerceVirtualOrderItemContentRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceVirtualOrderItemContentExportImportPortletPreferencesProcessor.java b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceVirtualOrderItemContentExportImportPortletPreferencesProcessor.java
index 02d34baed8ca30..bba733c6a906e4 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceVirtualOrderItemContentExportImportPortletPreferencesProcessor.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/exportimport/portlet/preferences/processor/CommerceVirtualOrderItemContentExportImportPortletPreferencesProcessor.java
@@ -12,9 +12,9 @@
import com.liferay.exportimport.portlet.preferences.processor.ExportImportPortletPreferencesProcessor;
import com.liferay.portal.kernel.util.ListUtil;
-import java.util.List;
+import jakarta.portlet.PortletPreferences;
-import javax.portlet.PortletPreferences;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -23,7 +23,7 @@
* @author Fabio Monaco
*/
@Component(
- property = "javax.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
+ property = "jakarta.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
service = ExportImportPortletPreferencesProcessor.class
)
public class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/CommerceVirtualOrderItemContentPortlet.java b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/CommerceVirtualOrderItemContentPortlet.java
index 80ae3b0c804891..d9c5fda601aa5f 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/CommerceVirtualOrderItemContentPortlet.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/CommerceVirtualOrderItemContentPortlet.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,13 +46,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Downloads",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Downloads",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/CommerceVirtualOrderItemContentConfigurationAction.java b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/CommerceVirtualOrderItemContentConfigurationAction.java
index b8d63708d6cbf1..2e4cee8cd1a7e0 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/CommerceVirtualOrderItemContentConfigurationAction.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/CommerceVirtualOrderItemContentConfigurationAction.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portlet.display.template.portlet.action.BaseConfigurationAction;
-import javax.portlet.PortletConfig;
+import jakarta.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
+ property = "jakarta.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
service = ConfigurationAction.class
)
public class CommerceVirtualOrderItemContentConfigurationAction
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/DownloadCommerceVirtualOrderItemMVCResourceCommand.java b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/DownloadCommerceVirtualOrderItemMVCResourceCommand.java
index 25796fe9a7c14f..0fc5ec71b13b47 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/DownloadCommerceVirtualOrderItemMVCResourceCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/DownloadCommerceVirtualOrderItemMVCResourceCommand.java
@@ -16,13 +16,13 @@
import com.liferay.portal.kernel.util.MimeTypesUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.ResourceRequest;
+import jakarta.portlet.ResourceResponse;
+
import java.io.File;
import java.io.FileInputStream;
-import javax.portlet.PortletException;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
+ "jakarta.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
"mvc.command.name=/commerce_virtual_order_item_content/download_commerce_virtual_order_item"
},
service = MVCResourceCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/ViewCommerceVirtualOrderItemTermsOfUseMVCRenderCommand.java b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/ViewCommerceVirtualOrderItemTermsOfUseMVCRenderCommand.java
index 998ca8f8d21f2c..2cf72655635be3 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/ViewCommerceVirtualOrderItemTermsOfUseMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/action/ViewCommerceVirtualOrderItemTermsOfUseMVCRenderCommand.java
@@ -22,9 +22,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
+ "jakarta.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
"mvc.command.name=/commerce_virtual_order_item_content/view_commerce_virtual_order_item_terms_of_use"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/display/template/CommerceVirtualOrderItemContentPortletDisplayTemplateHandler.java b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/display/template/CommerceVirtualOrderItemContentPortletDisplayTemplateHandler.java
index 51bd57bc5c38be..b818523283853c 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/display/template/CommerceVirtualOrderItemContentPortletDisplayTemplateHandler.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/java/com/liferay/commerce/product/type/virtual/order/content/web/internal/portlet/display/template/CommerceVirtualOrderItemContentPortletDisplayTemplateHandler.java
@@ -32,7 +32,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
+ property = "jakarta.portlet.name=" + CommerceVirtualOrderPortletKeys.COMMERCE_VIRTUAL_ORDER_ITEM_CONTENT,
service = TemplateHandler.class
)
public class CommerceVirtualOrderItemContentPortletDisplayTemplateHandler
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/resources/META-INF/resources/init.jsp
index acfa33c7f37266..c73ea008650f4d 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-content-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-service/build.gradle b/modules/apps/commerce/commerce-product-type-virtual-order-service/build.gradle
index d5e21dee783403..6c3fd4e11b12f7 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-service/build.gradle
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-service/build.gradle
@@ -5,9 +5,9 @@ buildService {
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-product-type-virtual-order-service/src/main/java/com/liferay/commerce/product/type/virtual/order/internal/upgrade/registry/CommerceProductTypeVirtualOrderServiceUpgradeStepRegistrator.java b/modules/apps/commerce/commerce-product-type-virtual-order-service/src/main/java/com/liferay/commerce/product/type/virtual/order/internal/upgrade/registry/CommerceProductTypeVirtualOrderServiceUpgradeStepRegistrator.java
index 4a06cf9e168083..bcbbf4641781cc 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-order-service/src/main/java/com/liferay/commerce/product/type/virtual/order/internal/upgrade/registry/CommerceProductTypeVirtualOrderServiceUpgradeStepRegistrator.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-order-service/src/main/java/com/liferay/commerce/product/type/virtual/order/internal/upgrade/registry/CommerceProductTypeVirtualOrderServiceUpgradeStepRegistrator.java
@@ -11,7 +11,7 @@
import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
import com.liferay.portlet.display.template.upgrade.BaseUpgradePortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-service/build.gradle b/modules/apps/commerce/commerce-product-type-virtual-service/build.gradle
index 878a43de36607f..a6d2e6b6625578 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-service/build.gradle
+++ b/modules/apps/commerce/commerce-product-type-virtual-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-product-api")
diff --git a/modules/apps/commerce/commerce-product-type-virtual-service/src/main/java/com/liferay/commerce/product/type/virtual/internal/product/content/contributor/SampleFileCPContentContributor.java b/modules/apps/commerce/commerce-product-type-virtual-service/src/main/java/com/liferay/commerce/product/type/virtual/internal/product/content/contributor/SampleFileCPContentContributor.java
index cfb20d8e7cefd1..78d5e3ce431288 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-service/src/main/java/com/liferay/commerce/product/type/virtual/internal/product/content/contributor/SampleFileCPContentContributor.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-service/src/main/java/com/liferay/commerce/product/type/virtual/internal/product/content/contributor/SampleFileCPContentContributor.java
@@ -21,7 +21,7 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/build.gradle b/modules/apps/commerce/commerce-product-type-virtual-web/build.gradle
index 7b5bd91a957fa1..b3c0a9147489e5 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/build.gradle
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-cart-taglib")
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/CPDefinitionVirtualSettingDisplayContext.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/CPDefinitionVirtualSettingDisplayContext.java
index fcdc84788e0a99..da38686fc04781 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/CPDefinitionVirtualSettingDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/CPDefinitionVirtualSettingDisplayContext.java
@@ -48,9 +48,9 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Collections;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/CommerceVirtualOrderItemEditDisplayContext.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/CommerceVirtualOrderItemEditDisplayContext.java
index 19853610fa4df1..ece12ea142455e 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/CommerceVirtualOrderItemEditDisplayContext.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/CommerceVirtualOrderItemEditDisplayContext.java
@@ -27,10 +27,10 @@
import com.liferay.portal.kernel.repository.model.FileEntry;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Collections;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
+import java.util.Collections;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/helper/CPDefinitionVirtualSettingRequestHelper.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/helper/CPDefinitionVirtualSettingRequestHelper.java
index 6b92d18756ac87..0e4cb934c476e5 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/helper/CPDefinitionVirtualSettingRequestHelper.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/display/context/helper/CPDefinitionVirtualSettingRequestHelper.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CPDefinitionVirtualSettingFDSActionProvider.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CPDefinitionVirtualSettingFDSActionProvider.java
index 36b0c23cecaea3..3269d27bd0c2e3 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CPDefinitionVirtualSettingFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CPDefinitionVirtualSettingFDSActionProvider.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CPDefinitionVirtualSettingFDSDataProvider.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CPDefinitionVirtualSettingFDSDataProvider.java
index 0981341f54cece..322ea531aba7e4 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CPDefinitionVirtualSettingFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CPDefinitionVirtualSettingFDSDataProvider.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CommerceVirtualOrderItemFileEntryFDSActionProvider.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CommerceVirtualOrderItemFileEntryFDSActionProvider.java
index af89b7aba71d82..0e26141b068ec6 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CommerceVirtualOrderItemFileEntryFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CommerceVirtualOrderItemFileEntryFDSActionProvider.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.portlet.PortletProviderUtil;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import java.util.List;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CommerceVirtualOrderItemFileEntryFDSDataProvider.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CommerceVirtualOrderItemFileEntryFDSDataProvider.java
index 95cc65a6661588..5632f1c5064743 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CommerceVirtualOrderItemFileEntryFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/data/set/CommerceVirtualOrderItemFileEntryFDSDataProvider.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsBaseInfoFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsBaseInfoFormNavigatorEntry.java
index e37523b1e5e1fa..31a9864c57bd21 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsBaseInfoFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsBaseInfoFormNavigatorEntry.java
@@ -11,16 +11,16 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsFormNavigatorEntry.java
index 48c7a1b5351659..1dc11710c584d7 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsFormNavigatorEntry.java
@@ -11,16 +11,16 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsSampleFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsSampleFormNavigatorEntry.java
index f4546174e1c362..7587ac2905b934 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsSampleFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsSampleFormNavigatorEntry.java
@@ -12,17 +12,17 @@
import com.liferay.portal.kernel.language.Language;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsTermsOfUseFormNavigatorEntry.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsTermsOfUseFormNavigatorEntry.java
index c0a6f1c7abb316..1de00043944eed 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsTermsOfUseFormNavigatorEntry.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/form/navigator/CPDefinitionVirtualSettingDetailsTermsOfUseFormNavigatorEntry.java
@@ -11,16 +11,16 @@
import com.liferay.frontend.taglib.form.navigator.FormNavigatorEntry;
import com.liferay.portal.kernel.language.Language;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.util.Locale;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CPDefinitionCPTypeVirtualScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CPDefinitionCPTypeVirtualScreenNavigationEntry.java
index 8e2debb051593d..8e71ed7413a1f9 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CPDefinitionCPTypeVirtualScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CPDefinitionCPTypeVirtualScreenNavigationEntry.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CPInstanceVirtualSettingsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CPInstanceVirtualSettingsScreenNavigationEntry.java
index 52e9a6ddeaac13..0f95d32495d661 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CPInstanceVirtualSettingsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CPInstanceVirtualSettingsScreenNavigationEntry.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemVirtualSettingsScreenNavigationEntry.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemVirtualSettingsScreenNavigationEntry.java
index 7a32bf0ccbd193..fe22106b850dd3 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemVirtualSettingsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/frontend/taglib/servlet/taglib/CommerceOrderItemVirtualSettingsScreenNavigationEntry.java
@@ -23,13 +23,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDVirtualSettingFileEntryMVCActionCommand.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDVirtualSettingFileEntryMVCActionCommand.java
index 5dfc731bedc38b..733793550a8e00 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDVirtualSettingFileEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDVirtualSettingFileEntryMVCActionCommand.java
@@ -36,14 +36,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
+
import java.util.HashMap;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -52,7 +52,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cpd_virtual_setting_file_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDVirtualSettingFileEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDVirtualSettingFileEntryMVCRenderCommand.java
index 77f06a076027cb..f0d751bae9197b 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDVirtualSettingFileEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDVirtualSettingFileEntryMVCRenderCommand.java
@@ -19,14 +19,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cpd_virtual_setting_file_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDefinitionVirtualSettingMVCActionCommand.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDefinitionVirtualSettingMVCActionCommand.java
index ad9495589c5b73..0b6e738c3163e0 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDefinitionVirtualSettingMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCPDefinitionVirtualSettingMVCActionCommand.java
@@ -34,13 +34,13 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -49,7 +49,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_cp_definition_virtual_setting"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemFileEntryMVCActionCommand.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemFileEntryMVCActionCommand.java
index 50918a0f1127a2..eb35d39850c213 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemFileEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemFileEntryMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_virtual_order_item_file_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemFileEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemFileEntryMVCRenderCommand.java
index e73ee6ae7667e2..1f2e64c4e3c4d3 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemFileEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemFileEntryMVCRenderCommand.java
@@ -19,14 +19,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_virtual_order_item_file_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemMVCActionCommand.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemMVCActionCommand.java
index d782d715eba313..96778f0f9b3e1f 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/EditCommerceVirtualOrderItemMVCActionCommand.java
@@ -17,10 +17,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.concurrent.TimeUnit;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.concurrent.TimeUnit;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,7 +30,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_ORDER,
"mvc.command.name=/commerce_order/edit_commerce_virtual_order_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/UploadCPDVirtualSettingFileEntryMVCActionCommand.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/UploadCPDVirtualSettingFileEntryMVCActionCommand.java
index 8cbb42532c7864..affa7ed01b661e 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/UploadCPDVirtualSettingFileEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/UploadCPDVirtualSettingFileEntryMVCActionCommand.java
@@ -35,13 +35,13 @@
import com.liferay.upload.UploadHandler;
import com.liferay.upload.UploadResponseHandler;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletRequest;
+
import java.io.IOException;
import java.io.InputStream;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -50,7 +50,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/upload_cpd_virtual_setting_file_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/helper/CPDefinitionVirtualSettingActionHelper.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/helper/CPDefinitionVirtualSettingActionHelper.java
index 4baf57a90f859a..5ff3a45103f92c 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/helper/CPDefinitionVirtualSettingActionHelper.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/action/helper/CPDefinitionVirtualSettingActionHelper.java
@@ -17,7 +17,7 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/template/VirtualCPTypeTemplateContextContributor.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/template/VirtualCPTypeTemplateContextContributor.java
index 83ab1e6f9371b1..a1862781aba457 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/template/VirtualCPTypeTemplateContextContributor.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/portlet/template/VirtualCPTypeTemplateContextContributor.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.type.virtual.util.VirtualCPTypeHelper;
import com.liferay.portal.kernel.template.TemplateContextContributor;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/servlet/taglib/VirtualCPTypeJSPDynamicInclude.java b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/servlet/taglib/VirtualCPTypeJSPDynamicInclude.java
index 8814c923867fa8..e9b3389a5b2b2f 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/servlet/taglib/VirtualCPTypeJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/java/com/liferay/commerce/product/type/virtual/web/internal/servlet/taglib/VirtualCPTypeJSPDynamicInclude.java
@@ -12,11 +12,11 @@
import com.liferay.portal.kernel.servlet.taglib.BaseJSPDynamicInclude;
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/resources/META-INF/resources/init.jsp
index c5c7d3ea6438b1..a6a63fd6438281 100644
--- a/modules/apps/commerce/commerce-product-type-virtual-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-product-type-virtual-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-qualifier-api/build.gradle b/modules/apps/commerce/commerce-qualifier-api/build.gradle
index d53e1f868df62f..0eaf7d2a864bd0 100644
--- a/modules/apps/commerce/commerce-qualifier-api/build.gradle
+++ b/modules/apps/commerce/commerce-qualifier-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-qualifier-service/build.gradle b/modules/apps/commerce/commerce-qualifier-service/build.gradle
index 7e7c7b441c6ad8..20c36ca9d89fd3 100644
--- a/modules/apps/commerce/commerce-qualifier-service/build.gradle
+++ b/modules/apps/commerce/commerce-qualifier-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-report-impl/build.gradle b/modules/apps/commerce/commerce-report-impl/build.gradle
index 7fe559803fcda7..43cae83c56df34 100644
--- a/modules/apps/commerce/commerce-report-impl/build.gradle
+++ b/modules/apps/commerce/commerce-report-impl/build.gradle
@@ -21,7 +21,7 @@ dependencies {
compileOnly group: "com.zaxxer", name: "SparseBitSet", version: "1.2"
compileOnly group: "commons-codec", name: "commons-codec", version: "1.15"
compileOnly group: "commons-digester", name: "commons-digester", version: "2.1"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
compileOnly group: "org.apache.commons", name: "commons-collections4", version: "4.4"
compileOnly group: "org.apache.commons", name: "commons-math3", version: "3.6.1"
compileOnly group: "org.apache.httpcomponents", name: "httpclient", version: "4.5.13"
diff --git a/modules/apps/commerce/commerce-service/build.gradle b/modules/apps/commerce/commerce-service/build.gradle
index d5bff1489720ec..0f780e3c68127d 100644
--- a/modules/apps/commerce/commerce-service/build.gradle
+++ b/modules/apps/commerce/commerce-service/build.gradle
@@ -4,12 +4,12 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay", name: "org.apache.felix.configadmin", version: "1.9.26.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/context/CommerceContextFactoryImpl.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/context/CommerceContextFactoryImpl.java
index d5db4a9193e143..5330a78d5c81c0 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/context/CommerceContextFactoryImpl.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/context/CommerceContextFactoryImpl.java
@@ -22,7 +22,7 @@
import com.liferay.portal.configuration.module.configuration.ConfigurationProvider;
import com.liferay.portal.kernel.util.Portal;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/CommerceContextPreAction.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/CommerceContextPreAction.java
index afa79e7105c238..039bbe8e93085f 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/CommerceContextPreAction.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/CommerceContextPreAction.java
@@ -20,8 +20,8 @@
import com.liferay.portal.kernel.service.GroupLocalService;
import com.liferay.portal.kernel.util.Portal;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/LoginPostAction.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/LoginPostAction.java
index ef6ebd2af1c0d4..82e9d22f60487a 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/LoginPostAction.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/LoginPostAction.java
@@ -43,14 +43,14 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
import java.util.List;
import java.util.Map;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/LogoutPreAction.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/LogoutPreAction.java
index e7791aefcc9b01..de9b817aa960e7 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/LogoutPreAction.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/events/LogoutPreAction.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/order/CommerceOrderHttpHelperImpl.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/order/CommerceOrderHttpHelperImpl.java
index 18090e8d573d4d..788c7b428acf2b 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/order/CommerceOrderHttpHelperImpl.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/order/CommerceOrderHttpHelperImpl.java
@@ -76,6 +76,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
import java.math.BigDecimal;
import java.util.Collections;
@@ -83,15 +92,6 @@
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/AvailabilityCPContentContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/AvailabilityCPContentContributor.java
index 787a68e95c5d66..7f36118f2e3f74 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/AvailabilityCPContentContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/AvailabilityCPContentContributor.java
@@ -29,9 +29,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Objects;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/AvailabilityEstimateCPContentContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/AvailabilityEstimateCPContentContributor.java
index 97ed12c2bb5533..0e1962309d5f4c 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/AvailabilityEstimateCPContentContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/AvailabilityEstimateCPContentContributor.java
@@ -30,12 +30,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/BackOrderabilityCPContentContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/BackOrderabilityCPContentContributor.java
index fd4afaea6e6afd..4c4b8229547750 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/BackOrderabilityCPContentContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/BackOrderabilityCPContentContributor.java
@@ -21,7 +21,7 @@
import com.liferay.portal.kernel.json.JSONObject;
import com.liferay.portal.kernel.util.Portal;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/DeliverySubscriptionInfoCPContentContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/DeliverySubscriptionInfoCPContentContributor.java
index c43d50b2ba84d7..46686391296ae2 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/DeliverySubscriptionInfoCPContentContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/DeliverySubscriptionInfoCPContentContributor.java
@@ -24,7 +24,7 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.TextFormatter;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/PriceCPContentContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/PriceCPContentContributor.java
index b7973175859e8a..0120e05208598c 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/PriceCPContentContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/PriceCPContentContributor.java
@@ -30,13 +30,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/PurchasabilityCPContentContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/PurchasabilityCPContentContributor.java
index 2fdf75d68f2e4a..248f69fa650e03 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/PurchasabilityCPContentContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/PurchasabilityCPContentContributor.java
@@ -11,7 +11,7 @@
import com.liferay.portal.kernel.json.JSONFactory;
import com.liferay.portal.kernel.json.JSONObject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/StockQuantityCPContentContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/StockQuantityCPContentContributor.java
index 1fb1c7d345aca1..7e6e86b451a84a 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/StockQuantityCPContentContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/StockQuantityCPContentContributor.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.json.JSONObject;
import com.liferay.portal.kernel.util.Portal;
-import java.math.BigDecimal;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/SubscriptionInfoCPContentContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/SubscriptionInfoCPContentContributor.java
index 370eeca28a48d2..fb4aab9dec7ab3 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/SubscriptionInfoCPContentContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/product/content/contributor/SubscriptionInfoCPContentContributor.java
@@ -25,7 +25,7 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/search/CommerceOrderItemIndexer.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/search/CommerceOrderItemIndexer.java
index c0a508734ba6ad..14cfac152bc58a 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/search/CommerceOrderItemIndexer.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/search/CommerceOrderItemIndexer.java
@@ -34,12 +34,12 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.search.expando.ExpandoBridgeIndexer;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+
import java.util.LinkedHashMap;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/search/CommerceSubscriptionEntryIndexer.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/search/CommerceSubscriptionEntryIndexer.java
index b736ea8b8860ec..f715a0cf194173 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/search/CommerceSubscriptionEntryIndexer.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/search/CommerceSubscriptionEntryIndexer.java
@@ -25,10 +25,10 @@
import com.liferay.portal.kernel.search.filter.BooleanFilter;
import com.liferay.portal.kernel.util.GetterUtil;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/servlet/filter/CommerceContextFilter.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/servlet/filter/CommerceContextFilter.java
index a891dcc32e751a..ffea71b2172ade 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/servlet/filter/CommerceContextFilter.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/servlet/filter/CommerceContextFilter.java
@@ -13,11 +13,11 @@
import com.liferay.portal.kernel.util.GetterUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/template/CommerceAccountTemplateContextContributor.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/template/CommerceAccountTemplateContextContributor.java
index caf5e3732c7ce3..139b395cad860d 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/template/CommerceAccountTemplateContextContributor.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/template/CommerceAccountTemplateContextContributor.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.util.CommerceAccountHelper;
import com.liferay.portal.kernel.template.TemplateContextContributor;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/upgrade/registry/CommerceServiceUpgradeStepRegistrator.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/upgrade/registry/CommerceServiceUpgradeStepRegistrator.java
index 893615e1762739..4d2bd45e8bad28 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/upgrade/registry/CommerceServiceUpgradeStepRegistrator.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/upgrade/registry/CommerceServiceUpgradeStepRegistrator.java
@@ -87,7 +87,7 @@
import com.liferay.portal.upgrade.registry.UpgradeStepRegistrator;
import com.liferay.portlet.display.template.upgrade.BaseUpgradePortletPreferences;
-import javax.portlet.PortletPreferences;
+import jakarta.portlet.PortletPreferences;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceAccountHelperImpl.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceAccountHelperImpl.java
index e701fa2c3f9e12..b9300b38538e52 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceAccountHelperImpl.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceAccountHelperImpl.java
@@ -51,16 +51,16 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceOrderItemQuantityFormatterImpl.java b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceOrderItemQuantityFormatterImpl.java
index 91af354a5fe0be..3a8a7a784411be 100644
--- a/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceOrderItemQuantityFormatterImpl.java
+++ b/modules/apps/commerce/commerce-service/src/main/java/com/liferay/commerce/internal/util/CommerceOrderItemQuantityFormatterImpl.java
@@ -38,6 +38,8 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -50,8 +52,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.portlet.ActionRequest;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
diff --git a/modules/apps/commerce/commerce-shipment-content-web/build.gradle b/modules/apps/commerce/commerce-shipment-content-web/build.gradle
index 33c7e7a47908b4..da161e7ca8062c 100644
--- a/modules/apps/commerce/commerce-shipment-content-web/build.gradle
+++ b/modules/apps/commerce/commerce-shipment-content-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/display/context/CommerceShipmentContentDisplayContext.java b/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/display/context/CommerceShipmentContentDisplayContext.java
index 27e075b212592e..cc47ff24ebf71e 100644
--- a/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/display/context/CommerceShipmentContentDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/display/context/CommerceShipmentContentDisplayContext.java
@@ -30,14 +30,14 @@
import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.Collections;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/display/context/helper/CommerceShipmentContentRequestHelper.java b/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/display/context/helper/CommerceShipmentContentRequestHelper.java
index 1a3a2bdca07702..d6ac6d67320cbf 100644
--- a/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/display/context/helper/CommerceShipmentContentRequestHelper.java
+++ b/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/display/context/helper/CommerceShipmentContentRequestHelper.java
@@ -10,10 +10,10 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/portlet/CommerceShipmentContentPortlet.java b/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/portlet/CommerceShipmentContentPortlet.java
index 0f01233c3b6847..a20b574ba927c1 100644
--- a/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/portlet/CommerceShipmentContentPortlet.java
+++ b/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/portlet/CommerceShipmentContentPortlet.java
@@ -15,12 +15,12 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCPortlet;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,13 +39,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Shipments",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT_CONTENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Shipments",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT_CONTENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/portlet/action/ViewCommerceShipmentItemsMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/portlet/action/ViewCommerceShipmentItemsMVCRenderCommand.java
index 791ef47f30900c..d944c172ac0816 100644
--- a/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/portlet/action/ViewCommerceShipmentItemsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-content-web/src/main/java/com/liferay/commerce/shipment/content/web/internal/portlet/action/ViewCommerceShipmentItemsMVCRenderCommand.java
@@ -15,9 +15,9 @@
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT_CONTENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT_CONTENT,
"mvc.command.name=/commerce_shipment_content/view_commerce_shipment_items"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-content-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-shipment-content-web/src/main/resources/META-INF/resources/init.jsp
index 78ef785345cebf..2dc6290aa03440 100644
--- a/modules/apps/commerce/commerce-shipment-content-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-shipment-content-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -27,7 +27,7 @@ page import="com.liferay.portal.kernel.util.ParamUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %>
-<%@ page import="javax.portlet.PortletURL" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
diff --git a/modules/apps/commerce/commerce-shipment-web/build.gradle b/modules/apps/commerce/commerce-shipment-web/build.gradle
index 76fe689d177357..6027f9b74d4936 100644
--- a/modules/apps/commerce/commerce-shipment-web/build.gradle
+++ b/modules/apps/commerce/commerce-shipment-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/application/list/CommerceShipmentPanelApp.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/application/list/CommerceShipmentPanelApp.java
index ecd2f479d96da9..cd50240b6de1a3 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/application/list/CommerceShipmentPanelApp.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/application/list/CommerceShipmentPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT + ")"
+ target = "(jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/custom/attributes/CommerceShipmentCustomAttributesDisplay.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/custom/attributes/CommerceShipmentCustomAttributesDisplay.java
index e0a2895c10e821..fe945ca4686fc6 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/custom/attributes/CommerceShipmentCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/custom/attributes/CommerceShipmentCustomAttributesDisplay.java
@@ -16,7 +16,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ property = "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
service = CustomAttributesDisplay.class
)
public class CommerceShipmentCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/BaseCommerceShipmentDisplayContext.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/BaseCommerceShipmentDisplayContext.java
index f0a676e07cfa30..256cf25325ae39 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/BaseCommerceShipmentDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/BaseCommerceShipmentDisplayContext.java
@@ -16,9 +16,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/CommerceShipmentDisplayContext.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/CommerceShipmentDisplayContext.java
index fe36e3dba7e04b..a0133adfd2ed81 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/CommerceShipmentDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/CommerceShipmentDisplayContext.java
@@ -55,17 +55,17 @@
import com.liferay.portal.kernel.webserver.WebServerServletTokenUtil;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
* @author Alec Sloan
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/CommerceShipmentItemDisplayContext.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/CommerceShipmentItemDisplayContext.java
index 7e4cddaad01c51..cbef28d78e1a81 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/CommerceShipmentItemDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/display/context/CommerceShipmentItemDisplayContext.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
-import java.math.BigDecimal;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseItemFDSDataProvider.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseItemFDSDataProvider.java
index 85be9f859d5eb7..722670bffbff79 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceInventoryWarehouseItemFDSDataProvider.java
@@ -38,13 +38,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceOrderShipmentFDSActionProvider.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceOrderShipmentFDSActionProvider.java
index 25aaf7929d767a..4e0e1c2f5de4be 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceOrderShipmentFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceOrderShipmentFDSActionProvider.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentFDSActionProvider.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentFDSActionProvider.java
index 63d4a4d3855aa0..db665dc1bfc747 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentFDSActionProvider.java
@@ -23,13 +23,13 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentFDSDataProvider.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentFDSDataProvider.java
index f85d8ae663ebf6..803624bd6cb7b8 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentFDSDataProvider.java
@@ -44,13 +44,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.workflow.WorkflowConstants;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentItemFDSDataProvider.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentItemFDSDataProvider.java
index 26add1f322c637..fe0b594a7f6bc3 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShipmentItemFDSDataProvider.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShippableOrderItemsFDSDataProvider.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShippableOrderItemsFDSDataProvider.java
index 3ec6493c8c9355..cc94c3c054d261 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShippableOrderItemsFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/CommerceShippableOrderItemsFDSDataProvider.java
@@ -37,12 +37,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/ProcessingCommerceShipmentItemFDSActionProvider.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/ProcessingCommerceShipmentItemFDSActionProvider.java
index 6399ed2c3eb5e6..073b9ead3c1ddf 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/ProcessingCommerceShipmentItemFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/ProcessingCommerceShipmentItemFDSActionProvider.java
@@ -28,14 +28,14 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/ShippedCommerceShipmentItemFDSActionProvider.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/ShippedCommerceShipmentItemFDSActionProvider.java
index 57845bbcbc91be..20b5cf109ec989 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/ShippedCommerceShipmentItemFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/data/set/provider/ShippedCommerceShipmentItemFDSActionProvider.java
@@ -23,13 +23,13 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/taglib/servlet/taglib/CommerceShipmentCustomFieldsScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/taglib/servlet/taglib/CommerceShipmentCustomFieldsScreenNavigationEntry.java
index a107f6fc6f4024..fe88fc37abefcc 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/taglib/servlet/taglib/CommerceShipmentCustomFieldsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/taglib/servlet/taglib/CommerceShipmentCustomFieldsScreenNavigationEntry.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.model.User;
import com.liferay.taglib.util.CustomAttributesUtil;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/taglib/servlet/taglib/CommerceShipmentShippingSummaryScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/taglib/servlet/taglib/CommerceShipmentShippingSummaryScreenNavigationEntry.java
index 931466b9ac7b62..d4e0500d66df51 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/taglib/servlet/taglib/CommerceShipmentShippingSummaryScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/frontend/taglib/servlet/taglib/CommerceShipmentShippingSummaryScreenNavigationEntry.java
@@ -9,11 +9,11 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/CommerceShipmentPortlet.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/CommerceShipmentPortlet.java
index 1a541a106e4651..591e6de04d9a5c 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/CommerceShipmentPortlet.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/CommerceShipmentPortlet.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -48,13 +48,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Shipments",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Shipments",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentItemsMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentItemsMVCRenderCommand.java
index 4aea791df4be29..971444a2947b2e 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentItemsMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentItemsMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/add_commerce_shipment_items"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentMVCRenderCommand.java
index 0ac9c014dc6010..d9b18c3db8029a 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/AddCommerceShipmentMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/add_commerce_shipment"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/DeleteCommerceShipmentMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/DeleteCommerceShipmentMVCRenderCommand.java
index 4966a565c8b510..bf09bf183e56d6 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/DeleteCommerceShipmentMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/DeleteCommerceShipmentMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/delete_commerce_shipment"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentAddressMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentAddressMVCRenderCommand.java
index 16bfecf21948a8..009a6a6caf1279 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentAddressMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentAddressMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment_address"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentCourierDetailMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentCourierDetailMVCRenderCommand.java
index fcdb3c3d2c24de..0fcb76c0549574 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentCourierDetailMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentCourierDetailMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment_courier_detail"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExpectedDateMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExpectedDateMVCRenderCommand.java
index ae6fe7697e82a1..4113b436c2be26 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExpectedDateMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExpectedDateMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment_expected_date"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExternalReferenceCodeMVCActionCommand.java
index cea2e6c80354b0..02adc9f35775ad 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExternalReferenceCodeMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExternalReferenceCodeMVCRenderCommand.java
index a9cf78fc6a756d..c61f86d0684cf0 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.constants.CommercePortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentItemMVCActionCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentItemMVCActionCommand.java
index 02b5dfadc76f9e..fcd9efdc652f0f 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentItemMVCActionCommand.java
@@ -44,15 +44,15 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.WindowStateException;
+
import java.math.BigDecimal;
import java.util.List;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.WindowStateException;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -62,7 +62,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentItemMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentItemMVCRenderCommand.java
index 3ee5dbb7458487..419c5ab94a149c 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentItemMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentItemMVCRenderCommand.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment_item"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCActionCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCActionCommand.java
index 520e9561319b74..99e190f2d4b2b8 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCActionCommand.java
@@ -26,13 +26,13 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.math.BigDecimal;
import java.util.Calendar;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,7 +42,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java
index 396e80b33817eb..11b0c7bc740c33 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentMVCRenderCommand.java
@@ -27,10 +27,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentShippingDateMVCRenderCommand.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentShippingDateMVCRenderCommand.java
index 0b9186c40d8243..c49bef32376c30 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentShippingDateMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/EditCommerceShipmentShippingDateMVCRenderCommand.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPMENT,
"mvc.command.name=/commerce_shipment/edit_commerce_shipment_shipping_date"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/helper/ActionHelper.java b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/helper/ActionHelper.java
index a79bae3d917a36..8d0e98ec9bfd08 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/helper/ActionHelper.java
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/java/com/liferay/commerce/shipment/web/internal/portlet/action/helper/ActionHelper.java
@@ -14,12 +14,12 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.ResourceRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.portlet.RenderRequest;
-import javax.portlet.ResourceRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipment-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-shipment-web/src/main/resources/META-INF/resources/init.jsp
index 5bf0b32eb468a7..5071ae21f6dee6 100644
--- a/modules/apps/commerce/commerce-shipment-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-shipment-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-api/build.gradle b/modules/apps/commerce/commerce-shipping-engine-fixed-api/build.gradle
index 8a0033ef48c2bf..3163feba6d7784 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-api/build.gradle
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-service/build.gradle b/modules/apps/commerce/commerce-shipping-engine-fixed-service/build.gradle
index 7f32c66d57c84f..0a1667da18c93e 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-service/build.gradle
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-service/src/main/java/com/liferay/commerce/shipping/engine/fixed/internal/search/CommerceShippingFixedOptionIndexer.java b/modules/apps/commerce/commerce-shipping-engine-fixed-service/src/main/java/com/liferay/commerce/shipping/engine/fixed/internal/search/CommerceShippingFixedOptionIndexer.java
index e544ead75a05f2..3dd044f5141f40 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-service/src/main/java/com/liferay/commerce/shipping/engine/fixed/internal/search/CommerceShippingFixedOptionIndexer.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-service/src/main/java/com/liferay/commerce/shipping/engine/fixed/internal/search/CommerceShippingFixedOptionIndexer.java
@@ -24,10 +24,10 @@
import com.liferay.portal.kernel.search.filter.TermFilter;
import com.liferay.portal.kernel.util.GetterUtil;
-import java.util.Locale;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
+import java.util.Locale;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/build.gradle b/modules/apps/commerce/commerce-shipping-engine-fixed-web/build.gradle
index 4d66dcfa5ab57f..19ce85c41fe5f2 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/build.gradle
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-currency-api")
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/BaseCommerceShippingFixedOptionDisplayContext.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/BaseCommerceShippingFixedOptionDisplayContext.java
index 7a82719bcb6b20..6f876f1ba947ad 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/BaseCommerceShippingFixedOptionDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/BaseCommerceShippingFixedOptionDisplayContext.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.math.BigDecimal;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.math.BigDecimal;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionQualifiersDisplayContext.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionQualifiersDisplayContext.java
index 7c1e8c4462a468..b968b1a60d754e 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionQualifiersDisplayContext.java
@@ -26,13 +26,13 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionRelsDisplayContext.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionRelsDisplayContext.java
index c20b3c8f3fa0a6..7ac28af2a53bb3 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionRelsDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionRelsDisplayContext.java
@@ -37,11 +37,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionsDisplayContext.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionsDisplayContext.java
index d141ebfc3f94a0..b7f4ad0f9fd4a2 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionsDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/CommerceShippingFixedOptionsDisplayContext.java
@@ -29,11 +29,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.ResourceBundle;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.ResourceBundle;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/helper/CommerceShippingFixedOptionRequestHelper.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/helper/CommerceShippingFixedOptionRequestHelper.java
index 952de4a9157439..2fbae1726ca4ed 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/helper/CommerceShippingFixedOptionRequestHelper.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/display/context/helper/CommerceShippingFixedOptionRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionFDSActionProvider.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionFDSActionProvider.java
index 5d42bb90a405b5..42494b425b032c 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionFDSActionProvider.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionFDSDataProvider.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionFDSDataProvider.java
index d65073f3f79774..b7e9dff15c2963 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionFDSDataProvider.java
@@ -25,9 +25,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionSettingFDSActionProvider.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionSettingFDSActionProvider.java
index ae1357ae0a2ffd..07c1c8fe524ab6 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionSettingFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionSettingFDSActionProvider.java
@@ -22,11 +22,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionSettingFDSDataProvider.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionSettingFDSDataProvider.java
index b0e0fadf122f2c..3dff073727fc00 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionSettingFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/data/set/provider/CommerceShippingFixedOptionSettingFDSDataProvider.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingFixedOptionDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingFixedOptionDetailsScreenNavigationEntry.java
index d177d48a529c18..d3f70ea7421af5 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingFixedOptionDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingFixedOptionDetailsScreenNavigationEntry.java
@@ -17,14 +17,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingFixedOptionQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingFixedOptionQualifiersScreenNavigationEntry.java
index 5bf34d98b916ca..74fe60c23475f8 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingFixedOptionQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingFixedOptionQualifiersScreenNavigationEntry.java
@@ -24,14 +24,14 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodFixedOptionSettingsScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodFixedOptionSettingsScreenNavigationEntry.java
index f7eb5247cb44cd..7e6cef50813ab2 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodFixedOptionSettingsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodFixedOptionSettingsScreenNavigationEntry.java
@@ -24,14 +24,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodFixedOptionsScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodFixedOptionsScreenNavigationEntry.java
index 71b3f1c450e5aa..dff1e15191a3eb 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodFixedOptionsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodFixedOptionsScreenNavigationEntry.java
@@ -20,14 +20,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionMVCActionCommand.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionMVCActionCommand.java
index c9e681377cb753..5c69fc7ea0b9fd 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionMVCActionCommand.java
@@ -27,16 +27,16 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletConfig;
+import jakarta.portlet.PortletRequest;
+
import java.math.BigDecimal;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,7 +45,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
"mvc.command.name=/commerce_shipping_methods/edit_commerce_shipping_fixed_option"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionMVCRenderCommand.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionMVCRenderCommand.java
index 34f346bcc03c1a..aeb9ce15ccb605 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionMVCRenderCommand.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -34,7 +34,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
"mvc.command.name=/commerce_shipping_methods/edit_commerce_shipping_fixed_option"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionQualifiersMVCActionCommand.java
index 42b1f78cf7a1c6..a729d80fb02923 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionQualifiersMVCActionCommand.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
"mvc.command.name=/commerce_shipping_methods/edit_commerce_shipping_fixed_option_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionRelMVCActionCommand.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionRelMVCActionCommand.java
index 0c29258e60da9d..36c5086e196915 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionRelMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionRelMVCActionCommand.java
@@ -22,10 +22,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import java.math.BigDecimal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.math.BigDecimal;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
"mvc.command.name=/commerce_shipping_methods/edit_commerce_shipping_fixed_option_rel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionRelMVCRenderCommand.java b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionRelMVCRenderCommand.java
index a924ca3e7b4a79..79e1dd13d77162 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionRelMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/java/com/liferay/commerce/shipping/engine/fixed/web/internal/portlet/action/EditCommerceShippingFixedOptionRelMVCRenderCommand.java
@@ -24,12 +24,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
"mvc.command.name=/commerce_shipping_methods/edit_commerce_shipping_fixed_option_rel"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/resources/META-INF/resources/init.jsp
index 8981aa56f7f72c..f5190e8fb1c2ac 100644
--- a/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-shipping-engine-fixed-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-shipping-engine/build.gradle b/modules/apps/commerce/commerce-shipping-engine/build.gradle
index b5528d9ad02818..26717fbcf5e5ee 100644
--- a/modules/apps/commerce/commerce-shipping-engine/build.gradle
+++ b/modules/apps/commerce/commerce-shipping-engine/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/frontend/data/set/provider/FunctionCommerceShippingEngineOptionsPageFDSDataProvider.java b/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/frontend/data/set/provider/FunctionCommerceShippingEngineOptionsPageFDSDataProvider.java
index 91321f1cc1ceb4..3f1b85cf29aac8 100644
--- a/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/frontend/data/set/provider/FunctionCommerceShippingEngineOptionsPageFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/frontend/data/set/provider/FunctionCommerceShippingEngineOptionsPageFDSDataProvider.java
@@ -21,9 +21,9 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/frontend/taglib/servlet/taglib/FunctionCommerceShippingMethodConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/frontend/taglib/servlet/taglib/FunctionCommerceShippingMethodConfigurationScreenNavigationEntry.java
index 2be9b74d1e2f9f..0d6461b55dca70 100644
--- a/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/frontend/taglib/servlet/taglib/FunctionCommerceShippingMethodConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/frontend/taglib/servlet/taglib/FunctionCommerceShippingMethodConfigurationScreenNavigationEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/portet/action/EditFunctionCommerceShippingMethodConfigurationMVCActionCommand.java b/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/portet/action/EditFunctionCommerceShippingMethodConfigurationMVCActionCommand.java
index 080781bfee562b..a3a22be12104b2 100644
--- a/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/portet/action/EditFunctionCommerceShippingMethodConfigurationMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipping-engine/src/main/java/com/liferay/commerce/shipping/engine/internal/portet/action/EditFunctionCommerceShippingMethodConfigurationMVCActionCommand.java
@@ -13,8 +13,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -24,7 +24,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
"mvc.command.name=/commerce_payment/edit_function_commerce_shipping_method_configuration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipping-engine/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-shipping-engine/src/main/resources/META-INF/resources/init.jsp
index 8431d1523c72a9..41cad5ef268b76 100644
--- a/modules/apps/commerce/commerce-shipping-engine/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-shipping-engine/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-shipping-origin-locator/build.gradle b/modules/apps/commerce/commerce-shipping-origin-locator/build.gradle
index df363d51a3d3c7..4284c328cb8e14 100644
--- a/modules/apps/commerce/commerce-shipping-origin-locator/build.gradle
+++ b/modules/apps/commerce/commerce-shipping-origin-locator/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-inventory-api")
diff --git a/modules/apps/commerce/commerce-shipping-web/build.gradle b/modules/apps/commerce/commerce-shipping-web/build.gradle
index dfc4a040e6e645..45a3ed411f8a2a 100644
--- a/modules/apps/commerce/commerce-shipping-web/build.gradle
+++ b/modules/apps/commerce/commerce-shipping-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-frontend-api")
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/display/context/CommerceShippingMethodsDisplayContext.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/display/context/CommerceShippingMethodsDisplayContext.java
index 35c4e47704f973..69ab0b7e2310e2 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/display/context/CommerceShippingMethodsDisplayContext.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/display/context/CommerceShippingMethodsDisplayContext.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.service.CountryService;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Locale;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/display/context/helper/CommerceShippingMethodRequestHelper.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/display/context/helper/CommerceShippingMethodRequestHelper.java
index e03225c262804a..3a8a3c0754abeb 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/display/context/helper/CommerceShippingMethodRequestHelper.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/display/context/helper/CommerceShippingMethodRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/data/set/provider/CommerceShippingRestrictionsPageFDSDataProvider.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/data/set/provider/CommerceShippingRestrictionsPageFDSDataProvider.java
index 4ccb10d8d73191..79bb71c85bfe3d 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/data/set/provider/CommerceShippingRestrictionsPageFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/data/set/provider/CommerceShippingRestrictionsPageFDSDataProvider.java
@@ -33,11 +33,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/taglib/servlet/taglib/CommerceChannelShippingRestrictionsScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/taglib/servlet/taglib/CommerceChannelShippingRestrictionsScreenNavigationEntry.java
index a604e1ebb02bae..ca6db6ddc483fb 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/taglib/servlet/taglib/CommerceChannelShippingRestrictionsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/taglib/servlet/taglib/CommerceChannelShippingRestrictionsScreenNavigationEntry.java
@@ -16,11 +16,11 @@
import com.liferay.portal.kernel.service.CountryService;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodDetailsScreenNavigationEntry.java
index f3797d747486cb..5b36bf7ee3874f 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/frontend/taglib/servlet/taglib/CommerceShippingMethodDetailsScreenNavigationEntry.java
@@ -9,10 +9,10 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/CommerceShippingMethodPortlet.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/CommerceShippingMethodPortlet.java
index 5a25d79c0e4b03..270c8d2eae7a9f 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/CommerceShippingMethodPortlet.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/CommerceShippingMethodPortlet.java
@@ -16,12 +16,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,13 +42,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Payment Methods",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/edit_commerce_shipping_method.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Payment Methods",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/edit_commerce_shipping_method.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/CommerceShippingMethodPortletProvider.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/CommerceShippingMethodPortletProvider.java
index 8f579beeea9545..390cfb94f3a6a1 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/CommerceShippingMethodPortletProvider.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/CommerceShippingMethodPortletProvider.java
@@ -12,10 +12,10 @@
import com.liferay.portal.kernel.portlet.PortletProvider;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/action/EditCommerceShippingMethodAddressRestrictionMVCActionCommand.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/action/EditCommerceShippingMethodAddressRestrictionMVCActionCommand.java
index 89dd9c8e34b699..619414e91d5712 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/action/EditCommerceShippingMethodAddressRestrictionMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/action/EditCommerceShippingMethodAddressRestrictionMVCActionCommand.java
@@ -28,12 +28,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.List;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,7 +42,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_shipping_method_address_restriction"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/action/EditCommerceShippingMethodMVCActionCommand.java b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/action/EditCommerceShippingMethodMVCActionCommand.java
index a75b701315096a..4f9b2f74724c39 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/action/EditCommerceShippingMethodMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/java/com/liferay/commerce/shipping/web/internal/portlet/action/EditCommerceShippingMethodMVCActionCommand.java
@@ -23,14 +23,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.io.File;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_SHIPPING_METHODS,
"mvc.command.name=/commerce_shipping_methods/edit_commerce_shipping_method"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-shipping-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-shipping-web/src/main/resources/META-INF/resources/init.jsp
index 840064bb39912e..132f00b15e84fb 100644
--- a/modules/apps/commerce/commerce-shipping-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-shipping-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-shop-by-diagram-api/build.gradle b/modules/apps/commerce/commerce-shop-by-diagram-api/build.gradle
index ce6bc7f8d37d2a..811aed41ed9221 100644
--- a/modules/apps/commerce/commerce-shop-by-diagram-api/build.gradle
+++ b/modules/apps/commerce/commerce-shop-by-diagram-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-shop-by-diagram-api/src/main/java/com/liferay/commerce/shop/by/diagram/type/CSDiagramType.java b/modules/apps/commerce/commerce-shop-by-diagram-api/src/main/java/com/liferay/commerce/shop/by/diagram/type/CSDiagramType.java
index 80efbb5808cb2a..b4583f11c53142 100644
--- a/modules/apps/commerce/commerce-shop-by-diagram-api/src/main/java/com/liferay/commerce/shop/by/diagram/type/CSDiagramType.java
+++ b/modules/apps/commerce/commerce-shop-by-diagram-api/src/main/java/com/liferay/commerce/shop/by/diagram/type/CSDiagramType.java
@@ -9,10 +9,10 @@
import com.liferay.commerce.shop.by.diagram.model.CSDiagramSetting;
-import java.util.Locale;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-shop-by-diagram-api/src/main/java/com/liferay/commerce/shop/by/diagram/util/CSDiagramCPTypeHelper.java b/modules/apps/commerce/commerce-shop-by-diagram-api/src/main/java/com/liferay/commerce/shop/by/diagram/util/CSDiagramCPTypeHelper.java
index 7a14bab729b7b6..bfc0eecc78036e 100644
--- a/modules/apps/commerce/commerce-shop-by-diagram-api/src/main/java/com/liferay/commerce/shop/by/diagram/util/CSDiagramCPTypeHelper.java
+++ b/modules/apps/commerce/commerce-shop-by-diagram-api/src/main/java/com/liferay/commerce/shop/by/diagram/util/CSDiagramCPTypeHelper.java
@@ -14,7 +14,7 @@
import com.liferay.portal.kernel.repository.model.FileVersion;
import com.liferay.portal.kernel.security.permission.PermissionChecker;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Danny Situ
diff --git a/modules/apps/commerce/commerce-shop-by-diagram-service/build.gradle b/modules/apps/commerce/commerce-shop-by-diagram-service/build.gradle
index f69670072bca4b..958561690ae4a2 100644
--- a/modules/apps/commerce/commerce-shop-by-diagram-service/build.gradle
+++ b/modules/apps/commerce/commerce-shop-by-diagram-service/build.gradle
@@ -4,8 +4,8 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:change-tracking:change-tracking-spi")
diff --git a/modules/apps/commerce/commerce-site-initializer/commerce-site-initializer-extender/build.gradle b/modules/apps/commerce/commerce-site-initializer/commerce-site-initializer-extender/build.gradle
index c869f855a272b1..5e25664ec45456 100644
--- a/modules/apps/commerce/commerce-site-initializer/commerce-site-initializer-extender/build.gradle
+++ b/modules/apps/commerce/commerce-site-initializer/commerce-site-initializer-extender/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-site-initializer/commerce-site-initializer-extender/src/main/java/com/liferay/commerce/site/initializer/extender/CommerceSiteInitializerImpl.java b/modules/apps/commerce/commerce-site-initializer/commerce-site-initializer-extender/src/main/java/com/liferay/commerce/site/initializer/extender/CommerceSiteInitializerImpl.java
index b255b4a558d1ba..4ad09f0b603c5a 100644
--- a/modules/apps/commerce/commerce-site-initializer/commerce-site-initializer-extender/src/main/java/com/liferay/commerce/site/initializer/extender/CommerceSiteInitializerImpl.java
+++ b/modules/apps/commerce/commerce-site-initializer/commerce-site-initializer-extender/src/main/java/com/liferay/commerce/site/initializer/extender/CommerceSiteInitializerImpl.java
@@ -89,6 +89,8 @@
import com.liferay.site.initializer.extender.CommerceSiteInitializer;
import com.liferay.site.initializer.extender.SiteInitializerUtil;
+import jakarta.servlet.ServletContext;
+
import java.math.BigDecimal;
import java.net.URL;
@@ -98,8 +100,6 @@
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
-
import org.osgi.framework.Bundle;
import org.osgi.framework.wiring.BundleWiring;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/commerce-subscription-web/build.gradle b/modules/apps/commerce/commerce-subscription-web/build.gradle
index c7934cdca55866..467d84e87d95ed 100644
--- a/modules/apps/commerce/commerce-subscription-web/build.gradle
+++ b/modules/apps/commerce/commerce-subscription-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/application/list/CommerceSubscriptionPanelApp.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/application/list/CommerceSubscriptionPanelApp.java
index d97805fb4763ae..84b71f2ae8d3f2 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/application/list/CommerceSubscriptionPanelApp.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/application/list/CommerceSubscriptionPanelApp.java
@@ -38,7 +38,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_ENTRY + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_ENTRY + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/BaseCPDefinitionSubscriptionInfoDisplayContext.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/BaseCPDefinitionSubscriptionInfoDisplayContext.java
index c05d94cb738cf6..b18a710033625c 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/BaseCPDefinitionSubscriptionInfoDisplayContext.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/BaseCPDefinitionSubscriptionInfoDisplayContext.java
@@ -17,11 +17,11 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alec Sloan
*/
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CPDefinitionSubscriptionInfoDisplayContext.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CPDefinitionSubscriptionInfoDisplayContext.java
index bab45f41ca09a1..ca527c6abb6163 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CPDefinitionSubscriptionInfoDisplayContext.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CPDefinitionSubscriptionInfoDisplayContext.java
@@ -12,9 +12,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CPInstanceSubscriptionInfoDisplayContext.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CPInstanceSubscriptionInfoDisplayContext.java
index 7273af4290e07b..b28c1246032ef1 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CPInstanceSubscriptionInfoDisplayContext.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CPInstanceSubscriptionInfoDisplayContext.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionContentDisplayContext.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionContentDisplayContext.java
index c8a34414c38f42..430efca66768dd 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionContentDisplayContext.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionContentDisplayContext.java
@@ -31,14 +31,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import java.util.Collections;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionEntryDisplayContext.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionEntryDisplayContext.java
index c4eb47d86df2ff..418c587bf4d14e 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionEntryDisplayContext.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/CommerceSubscriptionEntryDisplayContext.java
@@ -37,6 +37,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.webserver.WebServerServletTokenUtil;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
@@ -44,11 +49,6 @@
import java.util.Date;
import java.util.List;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Luca Pellizzon
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/helper/CommerceSubscriptionDisplayContextHelper.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/helper/CommerceSubscriptionDisplayContextHelper.java
index 77aea1981ea345..428152cb97ff10 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/helper/CommerceSubscriptionDisplayContextHelper.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/display/context/helper/CommerceSubscriptionDisplayContextHelper.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.portlet.url.builder.PortletURLBuilder;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletResponse;
+import jakarta.portlet.PortletURL;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionEntryFDSActionProvider.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionEntryFDSActionProvider.java
index 01a0216763a1f6..098cad33f0cbd6 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionEntryFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionEntryFDSActionProvider.java
@@ -24,13 +24,13 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionEntryFDSDataProvider.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionEntryFDSDataProvider.java
index 52960bf5163307..ee9a5b74338b8f 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionEntryFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionEntryFDSDataProvider.java
@@ -32,14 +32,14 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.PortletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import javax.portlet.PortletRequest;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionOrderItemFDSDataProvider.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionOrderItemFDSDataProvider.java
index 138b95d2dca411..5b436ecd8a5343 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionOrderItemFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionOrderItemFDSDataProvider.java
@@ -36,14 +36,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionPaymentsFDSDataProvider.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionPaymentsFDSDataProvider.java
index 1f0a713d952597..fd81fb0d3c95e6 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionPaymentsFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionPaymentsFDSDataProvider.java
@@ -31,6 +31,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -38,8 +40,6 @@
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionShipmentsFDSDataProvider.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionShipmentsFDSDataProvider.java
index 5ac8c32b1a3bd9..408fcc7acdd556 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionShipmentsFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/data/set/provider/CommerceSubscriptionShipmentsFDSDataProvider.java
@@ -38,14 +38,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.text.DateFormat;
import java.text.Format;
import java.util.List;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CPDefinitionSubscriptionScreenNavigationEntry.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CPDefinitionSubscriptionScreenNavigationEntry.java
index fbad40e2f85718..c82170d6673a42 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CPDefinitionSubscriptionScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CPDefinitionSubscriptionScreenNavigationEntry.java
@@ -25,11 +25,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CPInstanceSubscriptionInfoScreenNavigationEntry.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CPInstanceSubscriptionInfoScreenNavigationEntry.java
index 44b6ccb902dff7..1b45eb596f5392 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CPInstanceSubscriptionInfoScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CPInstanceSubscriptionInfoScreenNavigationEntry.java
@@ -23,11 +23,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryGeneralScreenNavigationEntry.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryGeneralScreenNavigationEntry.java
index 8a018531d7440d..2aab6924608981 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryGeneralScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryGeneralScreenNavigationEntry.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryPaymentsScreenNavigationEntry.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryPaymentsScreenNavigationEntry.java
index 13d992aca6b977..7515c8ba9967e7 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryPaymentsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryPaymentsScreenNavigationEntry.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryShipmentsScreenNavigationEntry.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryShipmentsScreenNavigationEntry.java
index bc79247078491c..6bbfb0bbdb14fa 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryShipmentsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/frontend/taglib/servlet/taglib/CommerceSubscriptionEntryShipmentsScreenNavigationEntry.java
@@ -18,11 +18,11 @@
import com.liferay.portal.kernel.security.permission.resource.PortletResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/CommerceSubscriptionContentPortlet.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/CommerceSubscriptionContentPortlet.java
index 8cfae6debe38ab..17ed4193b18557 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/CommerceSubscriptionContentPortlet.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/CommerceSubscriptionContentPortlet.java
@@ -16,14 +16,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -42,13 +42,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Product Subscriptions",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/my_subscriptions/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_CONTENT_WEB,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Product Subscriptions",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/my_subscriptions/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_CONTENT_WEB,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/CommerceSubscriptionEntryPortlet.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/CommerceSubscriptionEntryPortlet.java
index d3c77f01d308c4..9d89753f123c22 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/CommerceSubscriptionEntryPortlet.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/CommerceSubscriptionEntryPortlet.java
@@ -18,12 +18,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,13 +44,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Subscriptions",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_ENTRY,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Subscriptions",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_ENTRY,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionContentMVCActionCommand.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionContentMVCActionCommand.java
index 0ac423ed06b558..896016e78224e9 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionContentMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionContentMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_CONTENT_WEB,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_CONTENT_WEB,
"mvc.command.name=/commerce_subscription_content_web/edit_commerce_subscription_content"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionEntryMVCActionCommand.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionEntryMVCActionCommand.java
index 8ed4b72abf9b8d..63b7399a491c2a 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionEntryMVCActionCommand.java
@@ -24,12 +24,12 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.Objects;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,7 +39,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_ENTRY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_ENTRY,
"mvc.command.name=/commerce_subscription_entry/edit_commerce_subscription_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionEntryMVCRenderCommand.java
index 92bc0586c7a167..c8b5136516e488 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/java/com/liferay/commerce/subscription/web/internal/portlet/action/EditCommerceSubscriptionEntryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -20,7 +20,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_ENTRY,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_SUBSCRIPTION_ENTRY,
"mvc.command.name=/commerce_subscription_entry/edit_commerce_subscription_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-subscription-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-subscription-web/src/main/resources/META-INF/resources/init.jsp
index 25a2460fef4db5..131e5e3a4deb57 100644
--- a/modules/apps/commerce/commerce-subscription-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-subscription-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -50,6 +50,8 @@ page import="com.liferay.portal.kernel.util.WebKeys" %><%@
page import="com.liferay.portal.kernel.workflow.WorkflowConstants" %><%@
page import="com.liferay.taglib.servlet.PipingServletResponseFactory" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.util.Calendar" %><%@
page import="java.util.Date" %><%@
page import="java.util.HashMap" %><%@
@@ -57,8 +59,6 @@ page import="java.util.List" %><%@
page import="java.util.Map" %><%@
page import="java.util.StringJoiner" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-taglib/build.gradle b/modules/apps/commerce/commerce-taglib/build.gradle
index 557a8f00591555..e02fca4266e537 100644
--- a/modules/apps/commerce/commerce-taglib/build.gradle
+++ b/modules/apps/commerce/commerce-taglib/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.servlet.jsp", name: "javax.servlet.jsp-api", version: "2.3.3"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.1.1"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:account:account-api")
diff --git a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/OrderTransitionsTag.java b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/OrderTransitionsTag.java
index b6df159783e7e7..86661f785338c0 100644
--- a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/OrderTransitionsTag.java
+++ b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/OrderTransitionsTag.java
@@ -26,13 +26,13 @@
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.taglib.util.IncludeTag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/QuantityInputTag.java b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/QuantityInputTag.java
index 595442b09a227e..51280e990551a6 100644
--- a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/QuantityInputTag.java
+++ b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/QuantityInputTag.java
@@ -11,14 +11,14 @@
import com.liferay.commerce.taglib.servlet.taglib.internal.servlet.ServletContextUtil;
import com.liferay.taglib.util.IncludeTag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+
import java.math.BigDecimal;
import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-
/**
* @author Marco Leo
* @author Luca Pellizzon
diff --git a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/TierPriceTag.java b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/TierPriceTag.java
index 4c4baa3fc55b97..fa2530f0c06d90 100644
--- a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/TierPriceTag.java
+++ b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/TierPriceTag.java
@@ -27,11 +27,11 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.taglib.util.IncludeTag;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import java.util.List;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/UnitOfMeasureTierPriceTag.java b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/UnitOfMeasureTierPriceTag.java
index 32c0b8b8a44373..9ffa228ad7eed3 100644
--- a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/UnitOfMeasureTierPriceTag.java
+++ b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/UnitOfMeasureTierPriceTag.java
@@ -13,9 +13,9 @@
import com.liferay.portal.kernel.log.LogFactoryUtil;
import com.liferay.taglib.util.IncludeTag;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* @author Stefano Motta
diff --git a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/internal/servlet/ServletContextUtil.java b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/internal/servlet/ServletContextUtil.java
index 7ac1271dfb4f35..de9c14e155f838 100644
--- a/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/internal/servlet/ServletContextUtil.java
+++ b/modules/apps/commerce/commerce-taglib/src/main/java/com/liferay/commerce/taglib/servlet/taglib/internal/servlet/ServletContextUtil.java
@@ -16,7 +16,7 @@
import com.liferay.portal.kernel.module.service.Snapshot;
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/order_transitions/init.jsp b/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/order_transitions/init.jsp
index 9513edc0587380..c9c3989f19e6fe 100644
--- a/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/order_transitions/init.jsp
+++ b/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/order_transitions/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/quantity_input/init.jsp b/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/quantity_input/init.jsp
index 986bf1ed43855d..9e71d3e43907ab 100644
--- a/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/quantity_input/init.jsp
+++ b/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/quantity_input/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
diff --git a/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/tier_price/init.jsp b/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/tier_price/init.jsp
index ecdc35f0acd2a7..be1d4b99f339a6 100644
--- a/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/tier_price/init.jsp
+++ b/modules/apps/commerce/commerce-taglib/src/main/resources/META-INF/resources/tier_price/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-tax-api/build.gradle b/modules/apps/commerce/commerce-tax-api/build.gradle
index 1d79a79f54b281..0ae104cacd66b9 100644
--- a/modules/apps/commerce/commerce-tax-api/build.gradle
+++ b/modules/apps/commerce/commerce-tax-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-api/build.gradle b/modules/apps/commerce/commerce-tax-engine-fixed-api/build.gradle
index 39fe94e42b7236..dd079d4633807b 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-api/build.gradle
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-service/build.gradle b/modules/apps/commerce/commerce-tax-engine-fixed-service/build.gradle
index e4eee837e32cd4..18c1f2ad290e4e 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-service/build.gradle
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/build.gradle b/modules/apps/commerce/commerce-tax-engine-fixed-web/build.gradle
index 87f4d9ad1bad40..68801121fb7d26 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/build.gradle
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-currency-api")
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/BaseCommerceTaxFixedRateDisplayContext.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/BaseCommerceTaxFixedRateDisplayContext.java
index 67505277dbf1a5..eb81fb0c11a6fd 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/BaseCommerceTaxFixedRateDisplayContext.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/BaseCommerceTaxFixedRateDisplayContext.java
@@ -27,6 +27,9 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+
import java.math.BigDecimal;
import java.text.NumberFormat;
@@ -34,9 +37,6 @@
import java.util.List;
import java.util.Locale;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-
/**
* @author Marco Leo
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/CommerceTaxFixedRateAddressRelsDisplayContext.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/CommerceTaxFixedRateAddressRelsDisplayContext.java
index 1361c1e2a0021c..ad75ad6a15be90 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/CommerceTaxFixedRateAddressRelsDisplayContext.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/CommerceTaxFixedRateAddressRelsDisplayContext.java
@@ -33,10 +33,10 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PortalUtil;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
+import java.util.List;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/CommerceTaxFixedRatesDisplayContext.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/CommerceTaxFixedRatesDisplayContext.java
index 5ecfb3a97ee557..67f478927d468e 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/CommerceTaxFixedRatesDisplayContext.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/CommerceTaxFixedRatesDisplayContext.java
@@ -24,8 +24,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/helper/CommerceTaxFixedRateRequestHelper.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/helper/CommerceTaxFixedRateRequestHelper.java
index 2057e8a0f38d2a..6aa873ff3380a1 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/helper/CommerceTaxFixedRateRequestHelper.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/display/context/helper/CommerceTaxFixedRateRequestHelper.java
@@ -8,7 +8,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.portlet.RenderRequest;
+import jakarta.portlet.RenderRequest;
/**
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateFDSActionProvider.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateFDSActionProvider.java
index 0ca6205caaebbc..e43f9ccd1fdad4 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateFDSActionProvider.java
@@ -27,11 +27,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateFDSDataProvider.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateFDSDataProvider.java
index da3b3ce434e106..ca4794b7fa57c9 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateFDSDataProvider.java
@@ -29,13 +29,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateSettingFDSActionProvider.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateSettingFDSActionProvider.java
index f09dac591742ee..67badeec9cedde 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateSettingFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateSettingFDSActionProvider.java
@@ -27,12 +27,12 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateSettingFDSDataProvider.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateSettingFDSDataProvider.java
index e7ee2d26453fd6..29d58102f1faa3 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateSettingFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/data/set/provider/CommerceTaxRateSettingFDSDataProvider.java
@@ -32,13 +32,13 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAddressRateRelsScreenNavigationEntry.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAddressRateRelsScreenNavigationEntry.java
index 7c20f4795cbd56..c83f7b3c4e633a 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAddressRateRelsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodAddressRateRelsScreenNavigationEntry.java
@@ -23,13 +23,13 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodFixedRatesScreenNavigationEntry.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodFixedRatesScreenNavigationEntry.java
index 9e09a56b4ea548..99f8f90f074ee8 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodFixedRatesScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodFixedRatesScreenNavigationEntry.java
@@ -21,13 +21,13 @@
import com.liferay.portal.kernel.util.JavaConstants;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.RenderRequest;
-import javax.portlet.RenderRequest;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateAddressRelMVCActionCommand.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateAddressRelMVCActionCommand.java
index ebbc40b12ef6ee..98d7fc8f481cf6 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateAddressRelMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateAddressRelMVCActionCommand.java
@@ -25,10 +25,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
-import java.text.NumberFormat;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.text.NumberFormat;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
"mvc.command.name=/commerce_tax_methods/edit_commerce_tax_fixed_rate_address_rel"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateAddressRelMVCRenderCommand.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateAddressRelMVCRenderCommand.java
index 851c5242d5cb48..20baf85cbea710 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateAddressRelMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateAddressRelMVCRenderCommand.java
@@ -25,12 +25,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -40,7 +40,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
"mvc.command.name=/commerce_tax_methods/edit_commerce_tax_fixed_rate_address_rel"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateMVCActionCommand.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateMVCActionCommand.java
index 21bb3bd4dd7e37..ba968a4ed15f2b 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateMVCActionCommand.java
@@ -23,10 +23,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
-import java.text.NumberFormat;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.text.NumberFormat;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -36,7 +36,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
"mvc.command.name=/commerce_tax_methods/edit_commerce_tax_fixed_rate"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateMVCRenderCommand.java b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateMVCRenderCommand.java
index 3c79500ed1aae6..6c8afb2dbb5468 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/java/com/liferay/commerce/tax/engine/fixed/web/internal/portlet/action/EditCommerceTaxFixedRateMVCRenderCommand.java
@@ -23,12 +23,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
"mvc.command.name=/commerce_tax_methods/edit_commerce_tax_fixed_rate"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/resources/META-INF/resources/init.jsp
index 98387d57396673..a069f9b5a453ce 100644
--- a/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-tax-engine-fixed-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-tax-engine-remote/build.gradle b/modules/apps/commerce/commerce-tax-engine-remote/build.gradle
index abf0899747d752..0e13c647b981ec 100644
--- a/modules/apps/commerce/commerce-tax-engine-remote/build.gradle
+++ b/modules/apps/commerce/commerce-tax-engine-remote/build.gradle
@@ -2,10 +2,10 @@ dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.apache.httpcomponents", name: "httpclient", version: "4.5.13"
compileOnly group: "org.apache.httpcomponents", name: "httpcore", version: "4.4.14"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/commerce/commerce-tax-engine-remote/src/main/java/com/liferay/commerce/tax/engine/remote/internal/frontend/taglib/servlet/taglib/RemoteCommerceTaxMethodConfigurationScreenNavigationEntry.java b/modules/apps/commerce/commerce-tax-engine-remote/src/main/java/com/liferay/commerce/tax/engine/remote/internal/frontend/taglib/servlet/taglib/RemoteCommerceTaxMethodConfigurationScreenNavigationEntry.java
index a67ec4d6530f67..0c5e5cad18a069 100644
--- a/modules/apps/commerce/commerce-tax-engine-remote/src/main/java/com/liferay/commerce/tax/engine/remote/internal/frontend/taglib/servlet/taglib/RemoteCommerceTaxMethodConfigurationScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-tax-engine-remote/src/main/java/com/liferay/commerce/tax/engine/remote/internal/frontend/taglib/servlet/taglib/RemoteCommerceTaxMethodConfigurationScreenNavigationEntry.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.theme.ThemeDisplay;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-engine-remote/src/main/java/com/liferay/commerce/tax/engine/remote/internal/portlet/action/EditRemoteCommerceTaxConfigurationMVCActionCommand.java b/modules/apps/commerce/commerce-tax-engine-remote/src/main/java/com/liferay/commerce/tax/engine/remote/internal/portlet/action/EditRemoteCommerceTaxConfigurationMVCActionCommand.java
index ad5e61c7443355..3c57d4fc08f3a8 100644
--- a/modules/apps/commerce/commerce-tax-engine-remote/src/main/java/com/liferay/commerce/tax/engine/remote/internal/portlet/action/EditRemoteCommerceTaxConfigurationMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-tax-engine-remote/src/main/java/com/liferay/commerce/tax/engine/remote/internal/portlet/action/EditRemoteCommerceTaxConfigurationMVCActionCommand.java
@@ -17,9 +17,9 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletException;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+import jakarta.portlet.PortletException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -29,7 +29,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
"mvc.command.name=editRemoteCommerceTaxConfiguration"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-tax-service/build.gradle b/modules/apps/commerce/commerce-tax-service/build.gradle
index dbea6780effbb4..525633dc798a2b 100644
--- a/modules/apps/commerce/commerce-tax-service/build.gradle
+++ b/modules/apps/commerce/commerce-tax-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-tax-web/build.gradle b/modules/apps/commerce/commerce-tax-web/build.gradle
index fa3e14d96f1b85..489eaf20267d03 100644
--- a/modules/apps/commerce/commerce-tax-web/build.gradle
+++ b/modules/apps/commerce/commerce-tax-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-frontend-taglib")
diff --git a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/display/context/CommerceTaxMethodsDisplayContext.java b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/display/context/CommerceTaxMethodsDisplayContext.java
index 6b25c2ffe3356f..08c0a6817ca8ee 100644
--- a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/display/context/CommerceTaxMethodsDisplayContext.java
+++ b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/display/context/CommerceTaxMethodsDisplayContext.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
-import java.util.Locale;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.util.Locale;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodDetailScreenNavigationEntry.java b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodDetailScreenNavigationEntry.java
index 87ca2c6d355716..200fc10b43da5e 100644
--- a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodDetailScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/frontend/taglib/servlet/taglib/CommerceTaxMethodDetailScreenNavigationEntry.java
@@ -9,11 +9,11 @@
import com.liferay.frontend.taglib.servlet.taglib.ScreenNavigationEntry;
import com.liferay.frontend.taglib.servlet.taglib.util.JSPRenderer;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/CommerceTaxMethodPortlet.java b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/CommerceTaxMethodPortlet.java
index cea65eab97084b..4f639a326de14f 100644
--- a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/CommerceTaxMethodPortlet.java
+++ b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/CommerceTaxMethodPortlet.java
@@ -15,12 +15,12 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,13 +39,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Tax Methods",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/edit_commerce_tax_method.jsp",
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Tax Methods",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/edit_commerce_tax_method.jsp",
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/CommerceTaxMethodPortletProvider.java b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/CommerceTaxMethodPortletProvider.java
index 3a03b52fba8cb6..5fce43a714501a 100644
--- a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/CommerceTaxMethodPortletProvider.java
+++ b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/CommerceTaxMethodPortletProvider.java
@@ -12,10 +12,10 @@
import com.liferay.portal.kernel.portlet.PortletProvider;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/action/EditCommerceTaxMethodMVCActionCommand.java b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/action/EditCommerceTaxMethodMVCActionCommand.java
index 719682e03b3d1f..942f69e5d4032c 100644
--- a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/action/EditCommerceTaxMethodMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/action/EditCommerceTaxMethodMVCActionCommand.java
@@ -21,12 +21,12 @@
import com.liferay.portal.kernel.util.Localization;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -35,7 +35,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
+ "jakarta.portlet.name=" + CommercePortletKeys.COMMERCE_TAX_METHODS,
"mvc.command.name=/commerce_tax_methods/edit_commerce_tax_method"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/action/EditCommerceTaxMethodMVCRenderCommand.java b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/action/EditCommerceTaxMethodMVCRenderCommand.java
index 2cb82d3067543f..443b9182103a51 100644
--- a/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/action/EditCommerceTaxMethodMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-tax-web/src/main/java/com/liferay/commerce/tax/web/internal/portlet/action/EditCommerceTaxMethodMVCRenderCommand.java
@@ -13,12 +13,12 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.Portal;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_CHANNELS,
"mvc.command.name=/commerce_channels/edit_commerce_tax_method"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-tax-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-tax-web/src/main/resources/META-INF/resources/init.jsp
index 4ff9780207b78f..4424b3903752fb 100644
--- a/modules/apps/commerce/commerce-tax-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-tax-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-term-api/build.gradle b/modules/apps/commerce/commerce-term-api/build.gradle
index 4856b63f88be5f..a36bcec5b4c42f 100644
--- a/modules/apps/commerce/commerce-term-api/build.gradle
+++ b/modules/apps/commerce/commerce-term-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-term-service/build.gradle b/modules/apps/commerce/commerce-term-service/build.gradle
index b44ea97069b760..d58923f6332bd2 100644
--- a/modules/apps/commerce/commerce-term-service/build.gradle
+++ b/modules/apps/commerce/commerce-term-service/build.gradle
@@ -4,9 +4,9 @@ buildService {
}
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-term-web/build.gradle b/modules/apps/commerce/commerce-term-web/build.gradle
index 7ba433c7d37a09..7a7852d04f789b 100644
--- a/modules/apps/commerce/commerce-term-web/build.gradle
+++ b/modules/apps/commerce/commerce-term-web/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/application/list/CommerceTermEntryPanelApp.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/application/list/CommerceTermEntryPanelApp.java
index 221f511841bc72..6bb34c0fbc5786 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/application/list/CommerceTermEntryPanelApp.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/application/list/CommerceTermEntryPanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY + ")"
+ target = "(jakarta.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
index 00fabb697338e5..2f877c2efd1810 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceChannelAccountEntryRelDisplayContext.java
@@ -30,11 +30,11 @@
import com.liferay.portal.kernel.util.ListUtil;
import com.liferay.portal.kernel.util.ParamUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.Collections;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
*/
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceTermEntryDisplayContext.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceTermEntryDisplayContext.java
index 432da9e661fab8..20b9bf7ce5615c 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceTermEntryDisplayContext.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceTermEntryDisplayContext.java
@@ -30,14 +30,14 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceTermEntryQualifiersDisplayContext.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceTermEntryQualifiersDisplayContext.java
index be689b7b570555..e9a95d7958854c 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceTermEntryQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/CommerceTermEntryQualifiersDisplayContext.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Crescenzo Rega
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/helper/CommerceTermEntryRequestHelper.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/helper/CommerceTermEntryRequestHelper.java
index f44d941e856939..a851828dd6a1e0 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/helper/CommerceTermEntryRequestHelper.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/display/context/helper/CommerceTermEntryRequestHelper.java
@@ -7,7 +7,7 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/data/set/provider/TermEntryCommerceChannelAccountEntryRelFDSActionProvider.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/data/set/provider/TermEntryCommerceChannelAccountEntryRelFDSActionProvider.java
index 0a44cff225634d..b2a3b00363afc9 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/data/set/provider/TermEntryCommerceChannelAccountEntryRelFDSActionProvider.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/data/set/provider/TermEntryCommerceChannelAccountEntryRelFDSActionProvider.java
@@ -24,11 +24,11 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/data/set/provider/TermEntryCommerceChannelAccountEntryRelFDSDataProvider.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/data/set/provider/TermEntryCommerceChannelAccountEntryRelFDSDataProvider.java
index d7b2e400826ae5..49a89dbe227994 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/data/set/provider/TermEntryCommerceChannelAccountEntryRelFDSDataProvider.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/data/set/provider/TermEntryCommerceChannelAccountEntryRelFDSDataProvider.java
@@ -23,9 +23,9 @@
import com.liferay.portal.kernel.search.Sort;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/taglib/servlet/taglib/CommerceTermEntryDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/taglib/servlet/taglib/CommerceTermEntryDetailsScreenNavigationEntry.java
index 49b42c1a518af3..3df175d055f375 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/taglib/servlet/taglib/CommerceTermEntryDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/taglib/servlet/taglib/CommerceTermEntryDetailsScreenNavigationEntry.java
@@ -20,10 +20,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/taglib/servlet/taglib/CommerceTermEntryQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/taglib/servlet/taglib/CommerceTermEntryQualifiersScreenNavigationEntry.java
index fa3356dd90daa6..d27b0ab7bbc25f 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/taglib/servlet/taglib/CommerceTermEntryQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/frontend/taglib/servlet/taglib/CommerceTermEntryQualifiersScreenNavigationEntry.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/CommerceTermEntryPortlet.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/CommerceTermEntryPortlet.java
index b7c1c1d102b006..8e6abf2a157f0a 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/CommerceTermEntryPortlet.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/CommerceTermEntryPortlet.java
@@ -15,12 +15,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,13 +39,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Terms and Conditions",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Terms and Conditions",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/AddCommerceTermEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/AddCommerceTermEntryMVCRenderCommand.java
index 9ebe0f4ed2b6ab..3e5670f96cd1dd 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/AddCommerceTermEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/AddCommerceTermEntryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.term.constants.CommerceTermEntryPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
+ "jakarta.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
"mvc.command.name=/commerce_term_entry/add_commerce_term_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditAccountEntryDefaultCommerceTermEntryMVCActionCommand.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditAccountEntryDefaultCommerceTermEntryMVCActionCommand.java
index 35557e740de456..ba5617c8a584e5 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditAccountEntryDefaultCommerceTermEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditAccountEntryDefaultCommerceTermEntryMVCActionCommand.java
@@ -18,8 +18,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -30,8 +30,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_term_entry/edit_account_entry_default_commerce_term_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditAccountEntryDefaultCommerceTermEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditAccountEntryDefaultCommerceTermEntryMVCRenderCommand.java
index 9a005ab0e9e5fa..27d540911b1c35 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditAccountEntryDefaultCommerceTermEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditAccountEntryDefaultCommerceTermEntryMVCRenderCommand.java
@@ -19,13 +19,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,8 +38,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
- "javax.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_ADMIN,
+ "jakarta.portlet.name=" + AccountPortletKeys.ACCOUNT_ENTRIES_MANAGEMENT,
"mvc.command.name=/commerce_term_entry/edit_account_entry_default_commerce_term_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryExternalReferenceCodeMVCActionCommand.java
index e78fa705489435..e1c6bd5aca9484 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryExternalReferenceCodeMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
+ "jakarta.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
"mvc.command.name=/commerce_term_entry/edit_commerce_term_entry_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryExternalReferenceCodeMVCRenderCommand.java
index c95beaf996a335..b8cd60630334af 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.term.constants.CommerceTermEntryPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
+ "jakarta.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
"mvc.command.name=/commerce_term_entry/edit_commerce_term_entry_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryMVCActionCommand.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryMVCActionCommand.java
index bec7ed60a1f58d..de860415c37616 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryMVCActionCommand.java
@@ -23,13 +23,13 @@
import com.liferay.portal.kernel.util.PropertiesParamUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Calendar;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -38,7 +38,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
+ "jakarta.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
"mvc.command.name=/commerce_term_entry/edit_commerce_term_entry"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryMVCRenderCommand.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryMVCRenderCommand.java
index 88b60e29523bb2..77c8a33ad35c43 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.term.constants.CommerceTermEntryPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
+ "jakarta.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
"mvc.command.name=/commerce_term_entry/edit_commerce_term_entry"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryQualifiersMVCActionCommand.java
index 96c84aefc691b1..6c8075499d150a 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/portlet/action/EditCommerceTermEntryQualifiersMVCActionCommand.java
@@ -15,10 +15,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
+ "jakarta.portlet.name=" + CommerceTermEntryPortletKeys.COMMERCE_TERM_ENTRY,
"mvc.command.name=/commerce_term_entry/edit_commerce_term_entry_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/servlet/taglib/DefaultCommerceTermEntriesJSPDynamicInclude.java b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/servlet/taglib/DefaultCommerceTermEntriesJSPDynamicInclude.java
index 99597dcee1a21c..a50e426ce133c8 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/servlet/taglib/DefaultCommerceTermEntriesJSPDynamicInclude.java
+++ b/modules/apps/commerce/commerce-term-web/src/main/java/com/liferay/commerce/term/web/internal/servlet/taglib/DefaultCommerceTermEntriesJSPDynamicInclude.java
@@ -20,11 +20,11 @@
import com.liferay.portal.kernel.servlet.taglib.DynamicInclude;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-term-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-term-web/src/main/resources/META-INF/resources/init.jsp
index e34ea1237700c9..e08a5eb37a285d 100644
--- a/modules/apps/commerce/commerce-term-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-term-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/commerce-test-util/build.gradle b/modules/apps/commerce/commerce-test-util/build.gradle
index 44dbbe71a7d5c0..6f54740893bee8 100644
--- a/modules/apps/commerce/commerce-test-util/build.gradle
+++ b/modules/apps/commerce/commerce-test-util/build.gradle
@@ -1,9 +1,9 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.test", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "junit", name: "junit", version: "4.13.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:commerce:commerce-account-test-util")
diff --git a/modules/apps/commerce/commerce-test-util/src/main/java/com/liferay/commerce/test/util/context/TestCustomCommerceContextFactory.java b/modules/apps/commerce/commerce-test-util/src/main/java/com/liferay/commerce/test/util/context/TestCustomCommerceContextFactory.java
index e5e8e53ccc8787..4650efd1d8ecd6 100644
--- a/modules/apps/commerce/commerce-test-util/src/main/java/com/liferay/commerce/test/util/context/TestCustomCommerceContextFactory.java
+++ b/modules/apps/commerce/commerce-test-util/src/main/java/com/liferay/commerce/test/util/context/TestCustomCommerceContextFactory.java
@@ -20,7 +20,7 @@
import com.liferay.portal.configuration.module.configuration.ConfigurationProvider;
import com.liferay.portal.kernel.util.Portal;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-test-util/src/main/java/com/liferay/commerce/test/util/context/TestCustomCommerceContextHttp.java b/modules/apps/commerce/commerce-test-util/src/main/java/com/liferay/commerce/test/util/context/TestCustomCommerceContextHttp.java
index 93eeed6797647c..42b268af9cf45c 100644
--- a/modules/apps/commerce/commerce-test-util/src/main/java/com/liferay/commerce/test/util/context/TestCustomCommerceContextHttp.java
+++ b/modules/apps/commerce/commerce-test-util/src/main/java/com/liferay/commerce/test/util/context/TestCustomCommerceContextHttp.java
@@ -24,7 +24,7 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* @author Alec Sloan
diff --git a/modules/apps/commerce/commerce-test/build.gradle b/modules/apps/commerce/commerce-test/build.gradle
index bcf0cd2a62e959..09085820e47698 100644
--- a/modules/apps/commerce/commerce-test/build.gradle
+++ b/modules/apps/commerce/commerce-test/build.gradle
@@ -1,8 +1,8 @@
dependencies {
testIntegrationImplementation group: "com.github.ignaciotcrespo", name: "frutilla", version: "0.7.1"
+ testIntegrationImplementation group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
- testIntegrationImplementation group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- testIntegrationImplementation group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ testIntegrationImplementation group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
testIntegrationImplementation group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
testIntegrationImplementation group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
testIntegrationImplementation group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
diff --git a/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/internal/order/test/CommerceOrderHttpHelperImplTest.java b/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/internal/order/test/CommerceOrderHttpHelperImplTest.java
index f5b0308a06f896..a1582ee4245c73 100644
--- a/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/internal/order/test/CommerceOrderHttpHelperImplTest.java
+++ b/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/internal/order/test/CommerceOrderHttpHelperImplTest.java
@@ -49,13 +49,13 @@
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
import com.liferay.portal.theme.ThemeDisplayFactory;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.frutilla.FrutillaRule;
import org.junit.After;
diff --git a/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/product/internal/provider/test/CommerceSitemapURLProviderTest.java b/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/product/internal/provider/test/CommerceSitemapURLProviderTest.java
index 1a5f3caa6d83f6..bd671a9e96d042 100644
--- a/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/product/internal/provider/test/CommerceSitemapURLProviderTest.java
+++ b/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/product/internal/provider/test/CommerceSitemapURLProviderTest.java
@@ -60,6 +60,8 @@
import com.liferay.portal.theme.ThemeDisplayFactory;
import com.liferay.site.provider.SitemapURLProvider;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.InputStream;
import java.util.Collections;
@@ -67,8 +69,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.junit.Assert;
import org.junit.Before;
import org.junit.ClassRule;
diff --git a/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/test/CommerceCheckoutTest.java b/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/test/CommerceCheckoutTest.java
index 3cca7cd65ce85d..5508607ab4441f 100644
--- a/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/test/CommerceCheckoutTest.java
+++ b/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/test/CommerceCheckoutTest.java
@@ -84,12 +84,12 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
import org.frutilla.FrutillaRule;
import org.junit.Assert;
diff --git a/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/util/test/CommerceCheckoutStepTest.java b/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/util/test/CommerceCheckoutStepTest.java
index 7a1b747a9723fd..a3f1ae7392f1aa 100644
--- a/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/util/test/CommerceCheckoutStepTest.java
+++ b/modules/apps/commerce/commerce-test/src/testIntegration/java/com/liferay/commerce/util/test/CommerceCheckoutStepTest.java
@@ -46,11 +46,11 @@
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerMethodTestRule;
-import java.math.BigDecimal;
+import jakarta.portlet.ActionRequest;
-import javax.portlet.ActionRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
import org.frutilla.FrutillaRule;
diff --git a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/build.gradle b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/build.gradle
index 66a10e26b4988c..35674346cd3a17 100644
--- a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/build.gradle
+++ b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/src/main/java/com/liferay/commerce/theme/minium/internal/helper/CommerceThemeMiniumHttpHelper.java b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/src/main/java/com/liferay/commerce/theme/minium/internal/helper/CommerceThemeMiniumHttpHelper.java
index be54be5621c2cc..131a4d0d20dc63 100644
--- a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/src/main/java/com/liferay/commerce/theme/minium/internal/helper/CommerceThemeMiniumHttpHelper.java
+++ b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/src/main/java/com/liferay/commerce/theme/minium/internal/helper/CommerceThemeMiniumHttpHelper.java
@@ -26,15 +26,15 @@
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.ResourceBundle;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/src/main/java/com/liferay/commerce/theme/minium/internal/template/CommerceThemeMiniumTemplateContextContributor.java b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/src/main/java/com/liferay/commerce/theme/minium/internal/template/CommerceThemeMiniumTemplateContextContributor.java
index 56cdef0c439685..bdd343b8835210 100644
--- a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/src/main/java/com/liferay/commerce/theme/minium/internal/template/CommerceThemeMiniumTemplateContextContributor.java
+++ b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-impl/src/main/java/com/liferay/commerce/theme/minium/internal/template/CommerceThemeMiniumTemplateContextContributor.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.theme.minium.internal.helper.CommerceThemeMiniumHttpHelper;
import com.liferay.portal.kernel.template.TemplateContextContributor;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-site-initializer/build.gradle b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-site-initializer/build.gradle
index 1a45218d9ce7e4..61b54e677cc2e6 100644
--- a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-site-initializer/build.gradle
+++ b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-site-initializer/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.cm", version: "1.6.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-site-initializer/src/main/java/com/liferay/commerce/theme/minium/site/initializer/internal/MiniumSiteInitializer.java b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-site-initializer/src/main/java/com/liferay/commerce/theme/minium/site/initializer/internal/MiniumSiteInitializer.java
index 6b00e08aba95bb..4efefa4f48c1a6 100644
--- a/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-site-initializer/src/main/java/com/liferay/commerce/theme/minium/site/initializer/internal/MiniumSiteInitializer.java
+++ b/modules/apps/commerce/commerce-theme-minium/commerce-theme-minium-site-initializer/src/main/java/com/liferay/commerce/theme/minium/site/initializer/internal/MiniumSiteInitializer.java
@@ -95,6 +95,8 @@
import com.liferay.site.exception.InitializationException;
import com.liferay.site.initializer.SiteInitializer;
+import jakarta.servlet.ServletContext;
+
import java.io.File;
import java.io.InputStream;
@@ -108,8 +110,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
diff --git a/modules/apps/commerce/commerce-theme-speedwell/commerce-theme-speedwell-site-initializer/build.gradle b/modules/apps/commerce/commerce-theme-speedwell/commerce-theme-speedwell-site-initializer/build.gradle
index e44d2b66706f4f..f7e938f0edc777 100644
--- a/modules/apps/commerce/commerce-theme-speedwell/commerce-theme-speedwell-site-initializer/build.gradle
+++ b/modules/apps/commerce/commerce-theme-speedwell/commerce-theme-speedwell-site-initializer/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/commerce-theme-speedwell/commerce-theme-speedwell-site-initializer/src/main/java/com/liferay/commerce/theme/speedwell/site/initializer/internal/SpeedwellSiteInitializer.java b/modules/apps/commerce/commerce-theme-speedwell/commerce-theme-speedwell-site-initializer/src/main/java/com/liferay/commerce/theme/speedwell/site/initializer/internal/SpeedwellSiteInitializer.java
index 500fd8b1a46f29..20a46105742acb 100644
--- a/modules/apps/commerce/commerce-theme-speedwell/commerce-theme-speedwell-site-initializer/src/main/java/com/liferay/commerce/theme/speedwell/site/initializer/internal/SpeedwellSiteInitializer.java
+++ b/modules/apps/commerce/commerce-theme-speedwell/commerce-theme-speedwell-site-initializer/src/main/java/com/liferay/commerce/theme/speedwell/site/initializer/internal/SpeedwellSiteInitializer.java
@@ -97,6 +97,8 @@
import com.liferay.site.exception.InitializationException;
import com.liferay.site.initializer.SiteInitializer;
+import jakarta.servlet.ServletContext;
+
import java.io.File;
import java.io.InputStream;
@@ -111,8 +113,6 @@
import java.util.Map;
import java.util.ResourceBundle;
-import javax.servlet.ServletContext;
-
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
diff --git a/modules/apps/commerce/commerce-warehouse-web/build.gradle b/modules/apps/commerce/commerce-warehouse-web/build.gradle
index 78860b14b0f892..c268f5769bc5b0 100644
--- a/modules/apps/commerce/commerce-warehouse-web/build.gradle
+++ b/modules/apps/commerce/commerce-warehouse-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:account:account-api")
compileOnly project(":apps:application-list:application-list-api")
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/application/list/CommerceInventoryWarehousePanelApp.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/application/list/CommerceInventoryWarehousePanelApp.java
index 8abf4efe89fa6b..a8bd36c2157ee8 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/application/list/CommerceInventoryWarehousePanelApp.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/application/list/CommerceInventoryWarehousePanelApp.java
@@ -37,7 +37,7 @@ public String getPortletId() {
}
@Reference(
- target = "(javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE + ")"
+ target = "(jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE + ")"
)
private Portlet _portlet;
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/custom/attributes/CommerceInventoryWarehouseCustomAttributesDisplay.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/custom/attributes/CommerceInventoryWarehouseCustomAttributesDisplay.java
index bb12976405ed61..f8266335d4aa78 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/custom/attributes/CommerceInventoryWarehouseCustomAttributesDisplay.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/custom/attributes/CommerceInventoryWarehouseCustomAttributesDisplay.java
@@ -17,7 +17,7 @@
* @author Alessio Antonio Rendina
*/
@Component(
- property = "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
+ property = "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
service = CustomAttributesDisplay.class
)
public class CommerceInventoryWarehouseCustomAttributesDisplay
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehouseItemsDisplayContext.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehouseItemsDisplayContext.java
index efce39560ea37a..e1df4fd97911d9 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehouseItemsDisplayContext.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehouseItemsDisplayContext.java
@@ -25,16 +25,16 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.Portal;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Andrea Di Giorgi
* @author Marco Leo
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehouseQualifiersDisplayContext.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehouseQualifiersDisplayContext.java
index 617ecbd162b9d8..8c386703ef7466 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehouseQualifiersDisplayContext.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehouseQualifiersDisplayContext.java
@@ -22,12 +22,12 @@
import com.liferay.portal.kernel.security.permission.resource.ModelResourcePermission;
import com.liferay.portal.kernel.util.Portal;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.PortletRequest;
-import javax.portlet.PortletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Andrea Sbarra
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehousesDisplayContext.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehousesDisplayContext.java
index e89066e8a274d2..5351f73a2415c2 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehousesDisplayContext.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/display/context/CommerceInventoryWarehousesDisplayContext.java
@@ -30,17 +30,17 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import java.util.ArrayList;
-import java.util.List;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
+import jakarta.portlet.RenderResponse;
+import jakarta.portlet.RenderURL;
+import jakarta.portlet.WindowStateException;
-import javax.portlet.ActionRequest;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderResponse;
-import javax.portlet.RenderURL;
-import javax.portlet.WindowStateException;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CPInstanceWarehouseItemsScreenNavigationEntry.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CPInstanceWarehouseItemsScreenNavigationEntry.java
index d29163924aef5f..1559f5d9d0c601 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CPInstanceWarehouseItemsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CPInstanceWarehouseItemsScreenNavigationEntry.java
@@ -19,11 +19,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehouseDetailsScreenNavigationEntry.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehouseDetailsScreenNavigationEntry.java
index 7d2da06e64dc06..3dd7f053468c42 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehouseDetailsScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehouseDetailsScreenNavigationEntry.java
@@ -20,10 +20,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehouseQualifiersScreenNavigationEntry.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehouseQualifiersScreenNavigationEntry.java
index 28f911b3ef5012..cca33a9b136888 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehouseQualifiersScreenNavigationEntry.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/frontend/taglib/servlet/taglib/CommerceInventoryWarehouseQualifiersScreenNavigationEntry.java
@@ -21,10 +21,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/CommerceInventoryWarehousePortlet.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/CommerceInventoryWarehousePortlet.java
index 64c5e4565be5c3..6c632f83804369 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/CommerceInventoryWarehousePortlet.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/CommerceInventoryWarehousePortlet.java
@@ -15,12 +15,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -39,13 +39,13 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Warehouses",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/view.jsp",
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Warehouses",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/view.jsp",
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/AddCommerceInventoryWarehouseMVCRenderCommand.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/AddCommerceInventoryWarehouseMVCRenderCommand.java
index a63b40169ad5af..6a1f4b15f58948 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/AddCommerceInventoryWarehouseMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/AddCommerceInventoryWarehouseMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
"mvc.command.name=/commerce_inventory_warehouse/add_commerce_inventory_warehouse"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseExternalReferenceCodeMVCActionCommand.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseExternalReferenceCodeMVCActionCommand.java
index 09d35c58075aca..ff6047016caa20 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseExternalReferenceCodeMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseExternalReferenceCodeMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.servlet.SessionErrors;
import com.liferay.portal.kernel.util.ParamUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
"mvc.command.name=/commerce_inventory_warehouse/edit_commerce_inventory_warehouse_external_reference_code"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseExternalReferenceCodeMVCRenderCommand.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseExternalReferenceCodeMVCRenderCommand.java
index 6968f202757381..dbddafa3ee2b45 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseExternalReferenceCodeMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseExternalReferenceCodeMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.constants.CPPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -19,7 +19,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
"mvc.command.name=/commerce_inventory_warehouse/edit_commerce_inventory_warehouse_external_reference_code"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCActionCommand.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCActionCommand.java
index 4b8167791dea7c..7519b7f88251cf 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseItemMVCActionCommand.java
@@ -19,10 +19,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.math.BigDecimal;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.math.BigDecimal;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +33,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
+ "jakarta.portlet.name=" + CPPortletKeys.CP_DEFINITIONS,
"mvc.command.name=/cp_definitions/edit_commerce_inventory_warehouse_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCActionCommand.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCActionCommand.java
index b8bfefa9847743..29a83971b84a19 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCActionCommand.java
@@ -36,13 +36,13 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.StringUtil;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
+
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -52,7 +52,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
"mvc.command.name=/commerce_inventory_warehouse/edit_commerce_inventory_warehouse"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCRenderCommand.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCRenderCommand.java
index acd18ded1062aa..0c3f6904f294f0 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseMVCRenderCommand.java
@@ -13,10 +13,10 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -27,7 +27,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
"mvc.command.name=/commerce_inventory_warehouse/edit_commerce_inventory_warehouse"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseQualifiersMVCActionCommand.java b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseQualifiersMVCActionCommand.java
index d5b52eb4c575b1..8bba2dbda9b6a7 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseQualifiersMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/java/com/liferay/commerce/warehouse/web/internal/portlet/action/EditCommerceInventoryWarehouseQualifiersMVCActionCommand.java
@@ -18,10 +18,10 @@
import com.liferay.portal.kernel.util.Constants;
import com.liferay.portal.kernel.util.ParamUtil;
-import java.util.Objects;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.util.Objects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -31,7 +31,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
+ "jakarta.portlet.name=" + CPPortletKeys.COMMERCE_INVENTORY_WAREHOUSE,
"mvc.command.name=/commerce_inventory_warehouse/edit_commerce_inventory_warehouse_qualifiers"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-warehouse-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-warehouse-web/src/main/resources/META-INF/resources/init.jsp
index 5e2f669d0c3363..33bf3d458f99cf 100644
--- a/modules/apps/commerce/commerce-warehouse-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-warehouse-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
@@ -47,13 +47,13 @@ page import="com.liferay.portal.kernel.util.PortalUtil" %><%@
page import="com.liferay.portal.kernel.util.Validator" %><%@
page import="com.liferay.portal.kernel.util.WebKeys" %>
+<%@ page import="jakarta.portlet.PortletURL" %>
+
<%@ page import="java.math.BigDecimal" %>
<%@ page import="java.util.List" %><%@
page import="java.util.Objects" %>
-<%@ page import="javax.portlet.PortletURL" %>
-
diff --git a/modules/apps/commerce/commerce-wish-list-api/build.gradle b/modules/apps/commerce/commerce-wish-list-api/build.gradle
index 3c1e1e697d8a19..5652fa59caebf2 100644
--- a/modules/apps/commerce/commerce-wish-list-api/build.gradle
+++ b/modules/apps/commerce/commerce-wish-list-api/build.gradle
@@ -1,7 +1,7 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-product-api")
diff --git a/modules/apps/commerce/commerce-wish-list-api/src/main/java/com/liferay/commerce/wish/list/util/CommerceWishListHttpHelper.java b/modules/apps/commerce/commerce-wish-list-api/src/main/java/com/liferay/commerce/wish/list/util/CommerceWishListHttpHelper.java
index 8d3c9a9005b7e5..28fe260ea8384c 100644
--- a/modules/apps/commerce/commerce-wish-list-api/src/main/java/com/liferay/commerce/wish/list/util/CommerceWishListHttpHelper.java
+++ b/modules/apps/commerce/commerce-wish-list-api/src/main/java/com/liferay/commerce/wish/list/util/CommerceWishListHttpHelper.java
@@ -8,10 +8,10 @@
import com.liferay.commerce.wish.list.model.CommerceWishList;
import com.liferay.portal.kernel.exception.PortalException;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-wish-list-service/build.gradle b/modules/apps/commerce/commerce-wish-list-service/build.gradle
index 53cb8d5a2da5cb..90c6b1f3beafd4 100644
--- a/modules/apps/commerce/commerce-wish-list-service/build.gradle
+++ b/modules/apps/commerce/commerce-wish-list-service/build.gradle
@@ -5,9 +5,9 @@ buildService {
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/commerce-wish-list-service/src/main/java/com/liferay/commerce/wish/list/internal/util/CommerceWishListHttpHelperImpl.java b/modules/apps/commerce/commerce-wish-list-service/src/main/java/com/liferay/commerce/wish/list/internal/util/CommerceWishListHttpHelperImpl.java
index 91370d4c9f265f..b487de8243e119 100644
--- a/modules/apps/commerce/commerce-wish-list-service/src/main/java/com/liferay/commerce/wish/list/internal/util/CommerceWishListHttpHelperImpl.java
+++ b/modules/apps/commerce/commerce-wish-list-service/src/main/java/com/liferay/commerce/wish/list/internal/util/CommerceWishListHttpHelperImpl.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletURL;
+import jakarta.portlet.PortletRequest;
+import jakarta.portlet.PortletURL;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-wish-list-web/build.gradle b/modules/apps/commerce/commerce-wish-list-web/build.gradle
index c5313f7cec9f94..7c35886b767052 100644
--- a/modules/apps/commerce/commerce-wish-list-web/build.gradle
+++ b/modules/apps/commerce/commerce-wish-list-web/build.gradle
@@ -1,8 +1,8 @@
dependencies {
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.util.taglib", version: "default"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-application-list")
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/display/context/CommerceWishListDisplayContext.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/display/context/CommerceWishListDisplayContext.java
index 4a6c15ac838f24..671a1392553fa3 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/display/context/CommerceWishListDisplayContext.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/display/context/CommerceWishListDisplayContext.java
@@ -45,15 +45,15 @@
import com.liferay.portal.kernel.util.TextFormatter;
import com.liferay.portal.kernel.util.Validator;
+import jakarta.portlet.PortletURL;
+
+import jakarta.servlet.http.HttpServletRequest;
+
import java.math.BigDecimal;
import java.util.Iterator;
import java.util.List;
-import javax.portlet.PortletURL;
-
-import javax.servlet.http.HttpServletRequest;
-
/**
* @author Alessio Antonio Rendina
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/display/context/helper/CommerceWishListRequestHelper.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/display/context/helper/CommerceWishListRequestHelper.java
index ff2f6a8aa7796e..67e08eac2249ee 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/display/context/helper/CommerceWishListRequestHelper.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/display/context/helper/CommerceWishListRequestHelper.java
@@ -10,8 +10,8 @@
import com.liferay.portal.kernel.display.context.helper.BaseRequestHelper;
import com.liferay.portal.kernel.util.PortalUtil;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
* @author Andrea Di Giorgi
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/health/status/WishListContentCommerceHealthStatus.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/health/status/WishListContentCommerceHealthStatus.java
index c32dc8d0d52665..1edf79002185e8 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/health/status/WishListContentCommerceHealthStatus.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/health/status/WishListContentCommerceHealthStatus.java
@@ -19,12 +19,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.ResourceBundleUtil;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/CommerceWishListContentPortlet.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/CommerceWishListContentPortlet.java
index 7a3233667e0b7e..c25b575866dc9b 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/CommerceWishListContentPortlet.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/CommerceWishListContentPortlet.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -45,14 +45,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Commerce Wish List Content",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/wish_list_content/view.jsp",
- "javax.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.supported-public-render-parameter=commerceWishListId",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Commerce Wish List Content",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/wish_list_content/view.jsp",
+ "jakarta.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=commerceWishListId",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/MyCommerceWishListsPortlet.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/MyCommerceWishListsPortlet.java
index e485dcbb2e60b8..1192fc2746b52b 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/MyCommerceWishListsPortlet.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/MyCommerceWishListsPortlet.java
@@ -20,12 +20,12 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import java.io.IOException;
+import jakarta.portlet.Portlet;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import java.io.IOException;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,14 +44,14 @@
"com.liferay.portlet.private-session-attributes=false",
"com.liferay.portlet.render-weight=50",
"com.liferay.portlet.scopeable=true",
- "javax.portlet.display-name=Wish Lists",
- "javax.portlet.expiration-cache=0",
- "javax.portlet.init-param.view-template=/my_wish_lists/view.jsp",
- "javax.portlet.name=" + CommerceWishListPortletKeys.MY_COMMERCE_WISH_LISTS,
- "javax.portlet.resource-bundle=content.Language",
- "javax.portlet.security-role-ref=power-user,user",
- "javax.portlet.supported-public-render-parameter=commerceWishListId",
- "javax.portlet.version=3.0"
+ "jakarta.portlet.display-name=Wish Lists",
+ "jakarta.portlet.expiration-cache=0",
+ "jakarta.portlet.init-param.view-template=/my_wish_lists/view.jsp",
+ "jakarta.portlet.name=" + CommerceWishListPortletKeys.MY_COMMERCE_WISH_LISTS,
+ "jakarta.portlet.resource-bundle=content.Language",
+ "jakarta.portlet.security-role-ref=power-user,user",
+ "jakarta.portlet.supported-public-render-parameter=commerceWishListId",
+ "jakarta.portlet.version=4.0"
},
service = Portlet.class
)
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/AddCommerceWishListItemMVCActionCommand.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/AddCommerceWishListItemMVCActionCommand.java
index 424929ddbafc45..016feb79a632f1 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/AddCommerceWishListItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/AddCommerceWishListItemMVCActionCommand.java
@@ -31,11 +31,11 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,7 +46,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
+ "jakarta.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
"mvc.command.name=/commerce_wish_list_content/add_commerce_wish_list_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListItemMVCActionCommand.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListItemMVCActionCommand.java
index 56caa2449c4921..fcc9457a0d9620 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListItemMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListItemMVCActionCommand.java
@@ -17,8 +17,8 @@
import com.liferay.portal.kernel.util.ParamUtil;
import com.liferay.portal.kernel.util.StringUtil;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -28,7 +28,7 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
+ "jakarta.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
"mvc.command.name=/commerce_wish_list_content/edit_commerce_wish_list_item"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListMVCActionCommand.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListMVCActionCommand.java
index 5683eb58d71350..8583a19dc9df4c 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListMVCActionCommand.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListMVCActionCommand.java
@@ -22,8 +22,8 @@
import com.liferay.portal.kernel.util.StringUtil;
import com.liferay.portal.kernel.util.WebKeys;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import jakarta.portlet.ActionRequest;
+import jakarta.portlet.ActionResponse;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,8 +33,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
- "javax.portlet.name=" + CommerceWishListPortletKeys.MY_COMMERCE_WISH_LISTS,
+ "jakarta.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
+ "jakarta.portlet.name=" + CommerceWishListPortletKeys.MY_COMMERCE_WISH_LISTS,
"mvc.command.name=/commerce_wish_list_content/edit_commerce_wish_list"
},
service = MVCActionCommand.class
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListMVCRenderCommand.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListMVCRenderCommand.java
index ecc5c80e607e6f..b4ced42abd6445 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListMVCRenderCommand.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/portlet/action/EditCommerceWishListMVCRenderCommand.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.wish.list.constants.CommerceWishListPortletKeys;
import com.liferay.portal.kernel.portlet.bridges.mvc.MVCRenderCommand;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
+import jakarta.portlet.PortletException;
+import jakarta.portlet.RenderRequest;
+import jakarta.portlet.RenderResponse;
import org.osgi.service.component.annotations.Component;
@@ -20,8 +20,8 @@
*/
@Component(
property = {
- "javax.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
- "javax.portlet.name=" + CommerceWishListPortletKeys.MY_COMMERCE_WISH_LISTS,
+ "jakarta.portlet.name=" + CommerceWishListPortletKeys.COMMERCE_WISH_LIST_CONTENT,
+ "jakarta.portlet.name=" + CommerceWishListPortletKeys.MY_COMMERCE_WISH_LISTS,
"mvc.command.name=/commerce_wish_list_content/edit_commerce_wish_list"
},
service = MVCRenderCommand.class
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/template/CommerceWishListTemplateContextContributor.java b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/template/CommerceWishListTemplateContextContributor.java
index 34b508b6ce4c97..d8ddb3678d219a 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/template/CommerceWishListTemplateContextContributor.java
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/java/com/liferay/commerce/wish/list/web/internal/template/CommerceWishListTemplateContextContributor.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.wish.list.util.CommerceWishListHttpHelper;
import com.liferay.portal.kernel.template.TemplateContextContributor;
-import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/commerce-wish-list-web/src/main/resources/META-INF/resources/init.jsp b/modules/apps/commerce/commerce-wish-list-web/src/main/resources/META-INF/resources/init.jsp
index be970b65a85170..1c9c202d763fc5 100644
--- a/modules/apps/commerce/commerce-wish-list-web/src/main/resources/META-INF/resources/init.jsp
+++ b/modules/apps/commerce/commerce-wish-list-web/src/main/resources/META-INF/resources/init.jsp
@@ -5,7 +5,7 @@
*/
--%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="jakarta.tags.core" prefix="c" %>
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
diff --git a/modules/apps/commerce/headless/headless-commerce-core-api/build.gradle b/modules/apps/commerce/headless/headless-commerce-core-api/build.gradle
index 045a1be947e0e9..bb1c212d8d3f96 100644
--- a/modules/apps/commerce/headless/headless-commerce-core-api/build.gradle
+++ b/modules/apps/commerce/headless/headless-commerce-core-api/build.gradle
@@ -1,8 +1,8 @@
dependencies {
compileOnly group: "com.liferay", name: "biz.aQute.bnd.annotation", version: "4.2.0.LIFERAY-PATCHED-2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
compileOnly project(":apps:commerce:commerce-api")
compileOnly project(":apps:commerce:commerce-currency-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
diff --git a/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/exception/mapper/BaseExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/exception/mapper/BaseExceptionMapper.java
index d396ebfe589c84..07f6f832411049 100644
--- a/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/exception/mapper/BaseExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/exception/mapper/BaseExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
/**
* @author Igor Beslic
diff --git a/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/exception/mapper/BaseOrderValidatorExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/exception/mapper/BaseOrderValidatorExceptionMapper.java
index 581507af2bb0c6..fe987c50aabce5 100644
--- a/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/exception/mapper/BaseOrderValidatorExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/exception/mapper/BaseOrderValidatorExceptionMapper.java
@@ -12,10 +12,10 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import java.util.List;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.Provider;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.Provider;
+import java.util.List;
/**
* @author Andrea Sbarra
diff --git a/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/util/ActionUtil.java b/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/util/ActionUtil.java
index 17305358960e64..652527ccb500d6 100644
--- a/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/util/ActionUtil.java
+++ b/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/util/ActionUtil.java
@@ -5,14 +5,14 @@
package com.liferay.headless.commerce.core.util;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.List;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Luca Pellizzon
*/
diff --git a/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/util/IdUtils.java b/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/util/IdUtils.java
index a364672cdd7df5..f8f37d0128d370 100644
--- a/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/util/IdUtils.java
+++ b/modules/apps/commerce/headless/headless-commerce-core-api/src/main/java/com/liferay/headless/commerce/core/util/IdUtils.java
@@ -8,12 +8,12 @@
import com.liferay.portal.kernel.log.Log;
import com.liferay.portal.kernel.log.LogFactoryUtil;
+import jakarta.ws.rs.ClientErrorException;
+import jakarta.ws.rs.core.Response;
+
import java.text.NumberFormat;
import java.text.ParseException;
-import javax.ws.rs.ClientErrorException;
-import javax.ws.rs.core.Response;
-
/**
* @author Zoltán Takács
*/
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/bnd.bnd b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/bnd.bnd
index c85e8ec66efec6..cb1f6e19d250f1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/bnd.bnd
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/bnd.bnd
@@ -1,6 +1,6 @@
Bundle-Name: Liferay Headless Commerce Admin Account API
Bundle-SymbolicName: com.liferay.headless.commerce.admin.account.api
-Bundle-Version: 24.0.7
+Bundle-Version: 25.0.0
Export-Package:\
com.liferay.headless.commerce.admin.account.dto.v1_0,\
com.liferay.headless.commerce.admin.account.resource.v1_0
\ No newline at end of file
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/build.gradle b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/build.gradle
index 8f5e69a98e3a45..ce2ad05f0d3bd0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/build.gradle
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/build.gradle
@@ -1,13 +1,13 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.github.graphql-java", name: "graphql-java-annotations", version: "9.1"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:portal-odata:portal-odata-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Account.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Account.java
index abc3c3da08a252..3224524f51cda2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Account.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Account.java
@@ -16,6 +16,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,15 +37,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountAddress.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountAddress.java
index cce9c240761299..06cfa37da8fc97 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountAddress.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountAddress.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountChannelEntry.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountChannelEntry.java
index 0f8eee1c57ce6f..2135a2a43f8db3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountChannelEntry.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountChannelEntry.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountChannelShippingOption.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountChannelShippingOption.java
index 9bbf1b6532c14b..ac05036ab86d4e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountChannelShippingOption.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountChannelShippingOption.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountMember.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountMember.java
index 235e6197ad6012..08ac5e02e4e390 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountMember.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountMember.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountOrganization.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountOrganization.java
index 204a8efd15979d..20f957b594a28b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountOrganization.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountOrganization.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountRole.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountRole.java
index c0ce84f28c3c0c..33bc4ce27d8e52 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountRole.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AccountRole.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AdminAccountGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AdminAccountGroup.java
index 67d65c24b06b03..837a8752a6e9bb 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AdminAccountGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/AdminAccountGroup.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Body.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Body.java
index d48b4b64f9845d..3069c511f9a3f4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Body.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Body.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Body_1.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Body_1.java
index e96aa0015b5d98..59b11f036126d4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Body_1.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Body_1.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Error.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Error.java
index 4bcfb66af1f3eb..123a130b97dd80 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Error.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/Error.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/User.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/User.java
index abcc02e5705174..8e0e65d58d3638 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/User.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/dto/v1_0/User.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountAddressResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountAddressResource.java
index a0d857c2659ced..39d8c0932101d3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountAddressResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountAddressResource.java
@@ -20,19 +20,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountChannelEntryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountChannelEntryResource.java
index 7efa6d601e48ef..7c20c2ed19fe6a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountChannelEntryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountChannelEntryResource.java
@@ -20,18 +20,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountChannelShippingOptionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountChannelShippingOptionResource.java
index 57103f5db5d3c1..a1fad338fbd946 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountChannelShippingOptionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountChannelShippingOptionResource.java
@@ -20,19 +20,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountMemberResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountMemberResource.java
index fd629fbc018ae8..07357b692b016e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountMemberResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountMemberResource.java
@@ -20,19 +20,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountOrganizationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountOrganizationResource.java
index 33f24455f68784..dfc42eff80dc8f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountOrganizationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountOrganizationResource.java
@@ -20,19 +20,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountResource.java
index 43821144c1d628..4a149afcc67734 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AccountResource.java
@@ -21,19 +21,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AdminAccountGroupResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AdminAccountGroupResource.java
index 1ca6ded701fb46..5b8a27b0d57820 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AdminAccountGroupResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/AdminAccountGroupResource.java
@@ -20,19 +20,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/UserResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/UserResource.java
index d6dbb92380fb3b..17642d951ed611 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/UserResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/java/com/liferay/headless/commerce/admin/account/resource/v1_0/UserResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/resources/com/liferay/headless/commerce/admin/account/dto/v1_0/packageinfo b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/resources/com/liferay/headless/commerce/admin/account/dto/v1_0/packageinfo
index 7868c70c380095..b2e0b6bfe9d420 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/resources/com/liferay/headless/commerce/admin/account/dto/v1_0/packageinfo
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/resources/com/liferay/headless/commerce/admin/account/dto/v1_0/packageinfo
@@ -1 +1 @@
-version 8.0.0
\ No newline at end of file
+version 8.0.1
\ No newline at end of file
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/resources/com/liferay/headless/commerce/admin/account/resource/v1_0/packageinfo b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/resources/com/liferay/headless/commerce/admin/account/resource/v1_0/packageinfo
index bbb9c2183f6501..80e43ecfa86a54 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/resources/com/liferay/headless/commerce/admin/account/resource/v1_0/packageinfo
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-api/src/main/resources/com/liferay/headless/commerce/admin/account/resource/v1_0/packageinfo
@@ -1 +1 @@
-version 10.0.0
\ No newline at end of file
+version 11.0.0
\ No newline at end of file
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/build.gradle b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/build.gradle
index b802e77531117e..1c5c01ff57416f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/build.gradle
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
}
\ No newline at end of file
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/aggregation/Aggregation.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/aggregation/Aggregation.java
index a86270acd644e4..4a0396723af1ba 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/aggregation/Aggregation.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/aggregation/Aggregation.java
@@ -5,11 +5,11 @@
package com.liferay.headless.commerce.admin.account.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/aggregation/Facet.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/aggregation/Facet.java
index dc8cd4975a183f..c17af0266aec18 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/aggregation/Facet.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/aggregation/Facet.java
@@ -5,11 +5,11 @@
package com.liferay.headless.commerce.admin.account.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Account.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Account.java
index 75873259a40d42..1c4361e55b0905 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Account.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Account.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountAddress.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountAddress.java
index 744c0501b96089..826d2a201707bf 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountAddress.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountAddress.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountAddressSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountChannelEntry.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountChannelEntry.java
index 5521a50714ddb0..eb17eb2e32acec 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountChannelEntry.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountChannelEntry.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountChannelEntrySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountChannelShippingOption.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountChannelShippingOption.java
index 301495c9aece3f..a22f1cd2baeca9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountChannelShippingOption.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountChannelShippingOption.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountChannelShippingOptionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountMember.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountMember.java
index 0699e167bb2e6e..fde18ddcd21043 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountMember.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountMember.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountMemberSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountOrganization.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountOrganization.java
index 89c33b7129760f..dc1d1a2def456c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountOrganization.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountOrganization.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountOrganizationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountRole.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountRole.java
index 5ac58d80212a17..8f1cf63c96e249 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountRole.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AccountRole.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountRoleSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AdminAccountGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AdminAccountGroup.java
index ca0a4e6158ac1e..fa6628c28323dd 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AdminAccountGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/AdminAccountGroup.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AdminAccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Body.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Body.java
index c99982037a5b13..711cf3ded228e5 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Body.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Body.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.BodySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Body_1.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Body_1.java
index b8cd8c5083d9a0..45b343cbe32e34 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Body_1.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Body_1.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.Body_1SerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Error.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Error.java
index a8636ee7b7bc4a..0b21498373c5c1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Error.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/Error.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.ErrorSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/User.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/User.java
index 2f0f6193933120..f74f2380233d75 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/User.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/dto/v1_0/User.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.account.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.UserSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/function/UnsafeSupplier.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/function/UnsafeSupplier.java
index fb6d07e8e4b63e..5f0eaa075a6dcb 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/function/UnsafeSupplier.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/function/UnsafeSupplier.java
@@ -5,7 +5,7 @@
package com.liferay.headless.commerce.admin.account.client.function;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/http/HttpInvoker.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/http/HttpInvoker.java
index 17a9e76f7c00a3..90d230a1acd396 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/http/HttpInvoker.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/http/HttpInvoker.java
@@ -5,6 +5,8 @@
package com.liferay.headless.commerce.admin.account.client.http;
+import jakarta.annotation.Generated;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -29,8 +31,6 @@
import java.util.Set;
import java.util.regex.Matcher;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/json/BaseJSONParser.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/json/BaseJSONParser.java
index 594f2cbfc467ec..b64eaf7730b0b7 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/json/BaseJSONParser.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/json/BaseJSONParser.java
@@ -5,6 +5,8 @@
package com.liferay.headless.commerce.admin.account.client.json;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -18,8 +20,6 @@
import java.util.Stack;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/pagination/Page.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/pagination/Page.java
index e0f26609bfd7c1..4b2e793cc585da 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/pagination/Page.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/pagination/Page.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.account.client.aggregation.Facet;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/pagination/Pagination.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/pagination/Pagination.java
index 201b4a22893ca7..b40452c900e732 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/pagination/Pagination.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/pagination/Pagination.java
@@ -5,7 +5,7 @@
package com.liferay.headless.commerce.admin.account.client.pagination;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/permission/Permission.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/permission/Permission.java
index bfb5f82252fe56..af65aa7adc9a91 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/permission/Permission.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/permission/Permission.java
@@ -7,9 +7,9 @@
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/problem/Problem.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/problem/Problem.java
index e1a5d5dbe0cc5c..8f38d27d2dc8f8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/problem/Problem.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/problem/Problem.java
@@ -7,9 +7,9 @@
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Alessio Antonio Rendina
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountAddressResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountAddressResource.java
index 985d545618348d..e42c0fdb96abc4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountAddressResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountAddressResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.account.client.problem.Problem;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountAddressSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountChannelEntryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountChannelEntryResource.java
index 1c1bcfdf00c93a..ef9d187c9bc8c2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountChannelEntryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountChannelEntryResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.account.client.problem.Problem;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountChannelEntrySerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountChannelShippingOptionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountChannelShippingOptionResource.java
index e24420c7209802..8029a0ae0fe16b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountChannelShippingOptionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountChannelShippingOptionResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.account.client.problem.Problem;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountChannelShippingOptionSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountMemberResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountMemberResource.java
index f5ed5945b52433..b6ba88672b3de0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountMemberResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountMemberResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.account.client.problem.Problem;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountMemberSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountOrganizationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountOrganizationResource.java
index f60d6fc9e309d8..1347d6575f36e3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountOrganizationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountOrganizationResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.account.client.problem.Problem;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountOrganizationSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountResource.java
index e413622ef61212..1078ed1ddb554c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AccountResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.account.client.problem.Problem;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AccountSerDes;
+import jakarta.annotation.Generated;
+
import java.io.File;
import java.net.URL;
@@ -23,8 +25,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AdminAccountGroupResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AdminAccountGroupResource.java
index f56fe96c0b3090..bb1bd35625d186 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AdminAccountGroupResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/AdminAccountGroupResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.account.client.problem.Problem;
import com.liferay.headless.commerce.admin.account.client.serdes.v1_0.AdminAccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/UserResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/UserResource.java
index 71300537bbbff2..06b8712ea95218 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/UserResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/resource/v1_0/UserResource.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.account.client.http.HttpInvoker;
import com.liferay.headless.commerce.admin.account.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountAddressSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountAddressSerDes.java
index c171bfe43c7f71..a321941a018d4c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountAddressSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountAddressSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.AccountAddress;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountChannelEntrySerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountChannelEntrySerDes.java
index 5fd6543c3c26b9..b64e3610302d62 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountChannelEntrySerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountChannelEntrySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.AccountChannelEntry;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountChannelShippingOptionSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountChannelShippingOptionSerDes.java
index 02565174d8f6cc..5d20019495a0b6 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountChannelShippingOptionSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountChannelShippingOptionSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.AccountChannelShippingOption;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountMemberSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountMemberSerDes.java
index 4450c543d215fd..6eb5d9c4c75895 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountMemberSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountMemberSerDes.java
@@ -9,14 +9,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.AccountRole;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountOrganizationSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountOrganizationSerDes.java
index 89ec18fe8f5aff..95c8c9f84de0f1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountOrganizationSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountOrganizationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.AccountOrganization;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountRoleSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountRoleSerDes.java
index 84a0fac9300cf3..7319c60d66ab3a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountRoleSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountRoleSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.AccountRole;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountSerDes.java
index f365fa9f04a5f5..7a7bbbc383e04e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AccountSerDes.java
@@ -11,6 +11,8 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.AccountOrganization;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -20,8 +22,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AdminAccountGroupSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AdminAccountGroupSerDes.java
index 1e5e9c4c777e79..0c20d766ac15e8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AdminAccountGroupSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/AdminAccountGroupSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.AdminAccountGroup;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/BodySerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/BodySerDes.java
index ad884340068f7f..803f4039d4722d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/BodySerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/BodySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.Body;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/Body_1SerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/Body_1SerDes.java
index caf30e29938246..2692a9bd18e1e9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/Body_1SerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/Body_1SerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.Body_1;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/ErrorSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/ErrorSerDes.java
index 3744746a7f92c7..35e7cbf5acbb2e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/ErrorSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/ErrorSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.Error;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/UserSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/UserSerDes.java
index 907df0c0c854d8..766dae8bf31593 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/UserSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-client/src/main/java/com/liferay/headless/commerce/admin/account/client/serdes/v1_0/UserSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.account.client.dto.v1_0.User;
import com.liferay.headless.commerce.admin.account.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Alessio Antonio Rendina
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/build.gradle b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/build.gradle
index 11dbdcff197277..0e9f911f16d66c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/build.gradle
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/build.gradle
@@ -1,13 +1,13 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay", name: "org.apache.cxf.rt.frontend.jaxrs", version: "3.5.10.JAKARTA_LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.github.graphql-java", name: "graphql-java-annotations", version: "9.1"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.cxf", name: "cxf-rt-frontend-jaxrs", version: "3.5.10"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/mutation/v1_0/Mutation.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/mutation/v1_0/Mutation.java
index 2b273ec5e6e51f..57bd7306c8dab9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/mutation/v1_0/Mutation.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/mutation/v1_0/Mutation.java
@@ -32,15 +32,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.multipart.MultipartBody;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/query/v1_0/Query.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/query/v1_0/Query.java
index a93d22f43c47b8..a72b480974adcb 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/query/v1_0/Query.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/query/v1_0/Query.java
@@ -31,15 +31,15 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
-import java.util.Map;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/servlet/v1_0/ServletDataImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/servlet/v1_0/ServletDataImpl.java
index 4c0b2b407a4f44..980d9f06db7442 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/servlet/v1_0/ServletDataImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/graphql/servlet/v1_0/ServletDataImpl.java
@@ -26,11 +26,11 @@
import com.liferay.portal.kernel.util.ObjectValuePair;
import com.liferay.portal.vulcan.graphql.servlet.ServletData;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/application/HeadlessCommerceAdminAccountApplication.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/application/HeadlessCommerceAdminAccountApplication.java
index 73b9dabdf612a0..433c7d2a3abbd8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/application/HeadlessCommerceAdminAccountApplication.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/application/HeadlessCommerceAdminAccountApplication.java
@@ -5,9 +5,9 @@
package com.liferay.headless.commerce.admin.account.internal.jaxrs.application;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.core.Application;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressCityExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressCityExceptionMapper.java
index dee96399686d14..6884a4b42c57c2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressCityExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressCityExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.exception.CommerceAddressCityException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressCountryExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressCountryExceptionMapper.java
index 9b54a723bdacf3..79afd1f30cc388 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressCountryExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressCountryExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.exception.CommerceAddressCountryException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressNameExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressNameExceptionMapper.java
index 00cdfcd1657607..15f75c0550edc3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressNameExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressNameExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.exception.CommerceAddressNameException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressStreetExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressStreetExceptionMapper.java
index 275c2753af8fa3..aee6f67c903acf 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressStreetExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressStreetExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.exception.CommerceAddressStreetException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressZipExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressZipExceptionMapper.java
index 571fabf0e803a1..5513f925b5826e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressZipExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountAddressZipExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.exception.CommerceAddressZipException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountGroupNameExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountGroupNameExceptionMapper.java
index d5575cf630d75c..31ae5fc11a4ca9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountGroupNameExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountGroupNameExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.account.exception.AccountGroupNameException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountNameExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountNameExceptionMapper.java
index cff8963cd64bb0..8b6d384475861b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountNameExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountNameExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.account.exception.AccountGroupNameException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountUserRelEmailAddressExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountUserRelEmailAddressExceptionMapper.java
index 1a6d2c846168c6..5c687d4f5c3f5e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountUserRelEmailAddressExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/AccountUserRelEmailAddressExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.account.exception.AccountEntryUserRelEmailAddressException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateAccountExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateAccountExceptionMapper.java
index afad359fd07ea8..a45a7eebae4e68 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateAccountExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateAccountExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.account.exception.DuplicateAccountEntryIdException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateAccountGroupAccountRelExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateAccountGroupAccountRelExceptionMapper.java
index 5f2b248eb88f23..8309cfe7f47aa6 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateAccountGroupAccountRelExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateAccountGroupAccountRelExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.account.exception.DuplicateAccountGroupRelException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateChannelAccountRelExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateChannelAccountRelExceptionMapper.java
index 8ed14c8289737b..aabc1df8483e84 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateChannelAccountRelExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateChannelAccountRelExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.product.exception.DuplicateCommerceChannelAccountEntryRelException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateShippingOptionAccountRelExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateShippingOptionAccountRelExceptionMapper.java
index 00c72d4566897d..62e0731f9eeca3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateShippingOptionAccountRelExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/DuplicateShippingOptionAccountRelExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.commerce.exception.DuplicateCommerceShippingOptionAccountEntryRelException;
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/InvalidFilterExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/InvalidFilterExceptionMapper.java
index ddcd14bbb573a2..40e5d5f180ea05 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/InvalidFilterExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/jaxrs/exception/mapper/InvalidFilterExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.headless.commerce.core.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.odata.filter.InvalidFilterException;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountAddressResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountAddressResourceImpl.java
index f859a4a5308ec3..ddc292df28a295 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountAddressResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountAddressResourceImpl.java
@@ -29,9 +29,9 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
-import java.util.List;
+import jakarta.ws.rs.core.Response;
-import javax.ws.rs.core.Response;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountMemberResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountMemberResourceImpl.java
index 91a9d839c0e33b..ef84f88da11184 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountMemberResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountMemberResourceImpl.java
@@ -28,11 +28,11 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.ws.rs.core.Response;
+
import java.util.Arrays;
import java.util.List;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountOrganizationResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountOrganizationResourceImpl.java
index cb4dde23bde9d1..cd07ff8d7d2c8f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountOrganizationResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountOrganizationResourceImpl.java
@@ -21,9 +21,9 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
-import java.util.List;
+import jakarta.ws.rs.core.Response;
-import javax.ws.rs.core.Response;
+import java.util.List;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountResourceImpl.java
index ca6af2ec69ae8b..9c4df32a1ffca8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AccountResourceImpl.java
@@ -61,14 +61,14 @@
import com.liferay.portal.vulcan.pagination.Pagination;
import com.liferay.portal.vulcan.util.SearchUtil;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicy;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AdminAccountGroupResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AdminAccountGroupResourceImpl.java
index a7c81b2f7303a8..79c7899a307020 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AdminAccountGroupResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/AdminAccountGroupResourceImpl.java
@@ -28,12 +28,12 @@
import com.liferay.portal.vulcan.pagination.Pagination;
import com.liferay.portal.vulcan.util.SearchUtil;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+
import java.util.Collections;
import java.util.Map;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ServiceScope;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountAddressResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountAddressResourceImpl.java
index 4c3604acc23e7e..a5ece24cef20f0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountAddressResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountAddressResourceImpl.java
@@ -40,6 +40,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -49,23 +60,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alessio Antonio Rendina
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAccountAddressResourceImpl
implements AccountAddressResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -91,16 +91,16 @@ public abstract class BaseAccountAddressResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/accountAddresses/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountAddressByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -129,16 +129,16 @@ public Response deleteAccountAddressByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accountAddresses/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountAddress getAccountAddressByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -165,17 +165,17 @@ public AccountAddress getAccountAddressByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/accountAddresses/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchAccountAddressByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountAddress accountAddress)
throws Exception {
@@ -205,13 +205,14 @@ public Response patchAccountAddressByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/accountAddresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/accountAddresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -240,14 +241,14 @@ public Response deleteAccountAddress(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/accountAddresses/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/accountAddresses/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteAccountAddressBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -288,13 +289,14 @@ public Response deleteAccountAddressBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accountAddresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accountAddresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountAddress getAccountAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -321,14 +323,15 @@ public AccountAddress getAccountAddress(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/accountAddresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/accountAddresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountAddress patchAccountAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountAddress accountAddress)
throws Exception {
@@ -431,14 +434,15 @@ public AccountAddress patchAccountAddress(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accountAddresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accountAddresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public AccountAddress putAccountAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountAddress accountAddress)
throws Exception {
@@ -466,14 +470,14 @@ public AccountAddress putAccountAddress(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/accountAddresses/batch")
- @javax.ws.rs.Produces("application/json")
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/accountAddresses/batch")
+ @jakarta.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.PUT
@Override
public Response putAccountAddressBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -522,19 +526,19 @@ public Response putAccountAddressBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountAddresses"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountAddressesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -560,17 +564,17 @@ public Response putAccountAddressBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountAddresses"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountAddress postAccountByExternalReferenceCodeAccountAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountAddress accountAddress)
throws Exception {
@@ -606,15 +610,16 @@ public AccountAddress postAccountByExternalReferenceCodeAccountAddress(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/accountAddresses")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/accountAddresses")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountAddressesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -640,14 +645,15 @@ public Page getAccountIdAccountAddressesPage(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/accountAddresses")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/accountAddresses")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountAddress postAccountIdAccountAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountAddress accountAddress)
throws Exception {
@@ -675,14 +681,14 @@ public AccountAddress postAccountIdAccountAddress(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountAddress")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/accounts/accountAddresses/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/accounts/accountAddresses/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postAccountIdAccountAddressBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountChannelEntryResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountChannelEntryResourceImpl.java
index a42416bd92aed7..0ec2dd4929ff22 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountChannelEntryResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountChannelEntryResourceImpl.java
@@ -38,6 +38,15 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -47,21 +56,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alessio Antonio Rendina
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAccountChannelEntryResourceImpl
implements AccountChannelEntryResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate {
@@ -88,13 +88,14 @@ public abstract class BaseAccountChannelEntryResourceImpl
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-billing-addresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-billing-addresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelBillingAddressId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -121,13 +122,14 @@ public void deleteAccountChannelBillingAddressId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-billing-addresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-billing-addresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelBillingAddressId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -156,14 +158,15 @@ public AccountChannelEntry getAccountChannelBillingAddressId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-billing-addresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-billing-addresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelBillingAddressId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -193,13 +196,14 @@ public AccountChannelEntry patchAccountChannelBillingAddressId(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-currencies/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-currencies/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelCurrencyId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -226,13 +230,14 @@ public void deleteAccountChannelCurrencyId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-currencies/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-currencies/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelCurrencyId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -261,14 +266,15 @@ public AccountChannelEntry getAccountChannelCurrencyId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-currencies/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-currencies/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelCurrencyId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -298,13 +304,14 @@ public AccountChannelEntry patchAccountChannelCurrencyId(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-delivery-terms/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-delivery-terms/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelDeliveryTermId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -331,13 +338,14 @@ public void deleteAccountChannelDeliveryTermId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-delivery-terms/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-delivery-terms/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelDeliveryTermId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -366,14 +374,15 @@ public AccountChannelEntry getAccountChannelDeliveryTermId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-delivery-terms/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-delivery-terms/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelDeliveryTermId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -403,13 +412,14 @@ public AccountChannelEntry patchAccountChannelDeliveryTermId(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-discounts/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-discounts/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelDiscountId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -436,13 +446,14 @@ public void deleteAccountChannelDiscountId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-discounts/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-discounts/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelDiscountId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -471,14 +482,15 @@ public AccountChannelEntry getAccountChannelDiscountId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-discounts/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-discounts/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelDiscountId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -508,13 +520,14 @@ public AccountChannelEntry patchAccountChannelDiscountId(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-payment-methods/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-payment-methods/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelPaymentMethodId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -541,13 +554,14 @@ public void deleteAccountChannelPaymentMethodId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-payment-methods/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-payment-methods/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelPaymentMethodId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -576,14 +590,15 @@ public AccountChannelEntry getAccountChannelPaymentMethodId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-payment-methods/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-payment-methods/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelPaymentMethodId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -613,13 +628,14 @@ public AccountChannelEntry patchAccountChannelPaymentMethodId(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-payment-terms/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-payment-terms/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelPaymentTermId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -646,13 +662,14 @@ public void deleteAccountChannelPaymentTermId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-payment-terms/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-payment-terms/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelPaymentTermId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -681,14 +698,15 @@ public AccountChannelEntry getAccountChannelPaymentTermId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-payment-terms/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-payment-terms/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelPaymentTermId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -718,13 +736,14 @@ public AccountChannelEntry patchAccountChannelPaymentTermId(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-price-list/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-price-list/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelPriceListId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -751,13 +770,14 @@ public void deleteAccountChannelPriceListId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-price-list/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-price-list/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelPriceListId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -786,14 +806,15 @@ public AccountChannelEntry getAccountChannelPriceListId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-price-list/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-price-list/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelPriceListId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -823,13 +844,14 @@ public AccountChannelEntry patchAccountChannelPriceListId(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-shipping-addresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-shipping-addresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelShippingAddressId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -856,13 +878,14 @@ public void deleteAccountChannelShippingAddressId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-shipping-addresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-shipping-addresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelShippingAddressId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -891,14 +914,15 @@ public AccountChannelEntry getAccountChannelShippingAddressId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-shipping-addresses/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-shipping-addresses/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelShippingAddressId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -928,13 +952,14 @@ public AccountChannelEntry patchAccountChannelShippingAddressId(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-users/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-users/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelUserId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -961,13 +986,14 @@ public void deleteAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-users/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-users/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry getAccountChannelUserId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -996,14 +1022,15 @@ public AccountChannelEntry getAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-users/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-users/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry patchAccountChannelUserId(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1041,19 +1068,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-billing-addresses"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelBillingAddressesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1081,18 +1108,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-billing-addresses"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelBillingAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1130,19 +1157,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-currencies"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelCurrenciesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1170,18 +1197,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-currencies"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelCurrency(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1219,19 +1246,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-delivery-terms"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelDeliveryTermsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1259,18 +1286,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-delivery-terms"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelDeliveryTerm(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1308,19 +1335,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-discounts"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelDiscountsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1348,18 +1375,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-discounts"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelDiscount(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1397,19 +1424,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-payment-methods"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelPaymentMethodsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1437,18 +1464,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-payment-methods"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelPaymentMethod(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1486,19 +1513,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-payment-terms"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelPaymentTermsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1526,18 +1553,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-payment-terms"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelPaymentTerm(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1575,19 +1602,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-price-lists"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelPriceListsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1615,18 +1642,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-price-lists"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelPriceList(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1664,19 +1691,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-shipping-addresses"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelShippingAddressesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1704,18 +1731,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-shipping-addresses"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelShippingAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1753,19 +1780,19 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-users"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelUsersPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1793,18 +1820,18 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-users"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry
postAccountByExternalReferenceCodeAccountChannelUser(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1842,17 +1869,17 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-billing-addresses")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-billing-addresses")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountIdAccountChannelBillingAddressesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1880,14 +1907,15 @@ public AccountChannelEntry patchAccountChannelUserId(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-billing-addresses")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-billing-addresses")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelBillingAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -1925,15 +1953,16 @@ public AccountChannelEntry postAccountIdAccountChannelBillingAddress(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-currencies")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-currencies")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountChannelCurrenciesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -1961,14 +1990,15 @@ public Page getAccountIdAccountChannelCurrenciesPage(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-currencies")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-currencies")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelCurrency(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -2006,17 +2036,17 @@ public AccountChannelEntry postAccountIdAccountChannelCurrency(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-delivery-terms")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-delivery-terms")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountIdAccountChannelDeliveryTermsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -2044,14 +2074,15 @@ public AccountChannelEntry postAccountIdAccountChannelCurrency(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-delivery-terms")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-delivery-terms")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelDeliveryTerm(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -2089,15 +2120,16 @@ public AccountChannelEntry postAccountIdAccountChannelDeliveryTerm(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-discounts")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-discounts")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountChannelDiscountsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -2125,14 +2157,15 @@ public Page getAccountIdAccountChannelDiscountsPage(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-discounts")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-discounts")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelDiscount(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -2170,17 +2203,17 @@ public AccountChannelEntry postAccountIdAccountChannelDiscount(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-payment-methods")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-payment-methods")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountIdAccountChannelPaymentMethodsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -2208,14 +2241,15 @@ public AccountChannelEntry postAccountIdAccountChannelDiscount(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-payment-methods")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-payment-methods")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelPaymentMethod(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -2253,15 +2287,16 @@ public AccountChannelEntry postAccountIdAccountChannelPaymentMethod(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-payment-terms")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-payment-terms")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountChannelPaymentTermsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -2289,14 +2324,15 @@ public Page getAccountIdAccountChannelPaymentTermsPage(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-payment-terms")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-payment-terms")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelPaymentTerm(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -2334,15 +2370,16 @@ public AccountChannelEntry postAccountIdAccountChannelPaymentTerm(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-price-lists")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-price-lists")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountChannelPriceListsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -2370,14 +2407,15 @@ public Page getAccountIdAccountChannelPriceListsPage(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-price-lists")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-price-lists")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelPriceList(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -2415,17 +2453,17 @@ public AccountChannelEntry postAccountIdAccountChannelPriceList(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-shipping-addresses")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-shipping-addresses")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountIdAccountChannelShippingAddressesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -2453,14 +2491,15 @@ public AccountChannelEntry postAccountIdAccountChannelPriceList(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-shipping-addresses")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-shipping-addresses")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelShippingAddress(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
@@ -2498,15 +2537,16 @@ public AccountChannelEntry postAccountIdAccountChannelShippingAddress(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-users")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-users")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountChannelUsersPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -2534,14 +2574,15 @@ public Page getAccountIdAccountChannelUsersPage(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-users")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-users")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelEntry postAccountIdAccountChannelUser(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelEntry accountChannelEntry)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountChannelShippingOptionResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountChannelShippingOptionResourceImpl.java
index 7d6e9e7c355722..5c464f06093914 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountChannelShippingOptionResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountChannelShippingOptionResourceImpl.java
@@ -40,6 +40,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -49,23 +60,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alessio Antonio Rendina
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAccountChannelShippingOptionResourceImpl
implements AccountChannelShippingOptionResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -91,13 +91,14 @@ public abstract class BaseAccountChannelShippingOptionResourceImpl
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-shipping-options/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-shipping-options/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAccountChannelShippingOption(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -122,14 +123,14 @@ public void deleteAccountChannelShippingOption(
)
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/account-channel-shipping-options/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/account-channel-shipping-options/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteAccountChannelShippingOptionBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -171,13 +172,14 @@ public Response deleteAccountChannelShippingOptionBatch(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/account-channel-shipping-options/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/account-channel-shipping-options/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelShippingOption getAccountChannelShippingOption(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -204,14 +206,15 @@ public AccountChannelShippingOption getAccountChannelShippingOption(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/account-channel-shipping-options/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/account-channel-shipping-options/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelShippingOption patchAccountChannelShippingOption(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelShippingOption accountChannelShippingOption)
throws Exception {
@@ -247,19 +250,19 @@ public AccountChannelShippingOption patchAccountChannelShippingOption(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-shipping-option"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountChannelShippingOptionPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -285,18 +288,18 @@ public AccountChannelShippingOption patchAccountChannelShippingOption(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/account-channel-shipping-option"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelShippingOption
postAccountByExternalReferenceCodeAccountChannelShippingOption(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountChannelShippingOption accountChannelShippingOption)
throws Exception {
@@ -332,17 +335,17 @@ public AccountChannelShippingOption patchAccountChannelShippingOption(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/account-channel-shipping-option")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-shipping-option")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountIdAccountChannelShippingOptionPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -368,16 +371,16 @@ public AccountChannelShippingOption patchAccountChannelShippingOption(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/account-channel-shipping-option")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/account-channel-shipping-option")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountChannelShippingOption
postAccountIdAccountChannelShippingOption(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountChannelShippingOption accountChannelShippingOption)
throws Exception {
@@ -405,14 +408,14 @@ public AccountChannelShippingOption patchAccountChannelShippingOption(
)
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/accounts/account-channel-shipping-option/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/accounts/account-channel-shipping-option/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postAccountIdAccountChannelShippingOptionBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountMemberResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountMemberResourceImpl.java
index 896b5aae62cc19..be2e9c8ac32d64 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountMemberResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountMemberResourceImpl.java
@@ -39,6 +39,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -48,23 +59,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alessio Antonio Rendina
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAccountMemberResourceImpl
implements AccountMemberResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate {
@@ -97,19 +97,19 @@ public abstract class BaseAccountMemberResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountMembers"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountMembersPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -135,17 +135,17 @@ public abstract class BaseAccountMemberResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountMembers"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountMember postAccountByExternalReferenceCodeAccountMember(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountMember accountMember)
throws Exception {
@@ -177,20 +177,20 @@ public AccountMember postAccountByExternalReferenceCodeAccountMember(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountMembers/{userId}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountByExternalReferenceCodeAccountMember(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("userId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("userId")
Long userId)
throws Exception {
@@ -223,20 +223,20 @@ public Response deleteAccountByExternalReferenceCodeAccountMember(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountMembers/{userId}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountMember getAccountByExternalReferenceCodeAccountMember(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("userId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("userId")
Long userId)
throws Exception {
@@ -267,21 +267,21 @@ public AccountMember getAccountByExternalReferenceCodeAccountMember(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountMembers/{userId}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchAccountByExternalReferenceCodeAccountMember(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("userId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("userId")
Long userId,
AccountMember accountMember)
throws Exception {
@@ -319,15 +319,16 @@ public Response patchAccountByExternalReferenceCodeAccountMember(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/accountMembers")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/accountMembers")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountMembersPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -353,14 +354,15 @@ public Page getAccountIdAccountMembersPage(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/accountMembers")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/accountMembers")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountMember postAccountIdAccountMember(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountMember accountMember)
throws Exception {
@@ -388,14 +390,14 @@ public AccountMember postAccountIdAccountMember(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/accounts/accountMembers/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/accounts/accountMembers/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postAccountIdAccountMemberBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -440,17 +442,18 @@ public Response postAccountIdAccountMemberBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/accounts/{id}/accountMembers/{userId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/accounts/{id}/accountMembers/{userId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountIdAccountMember(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("userId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("userId")
Long userId)
throws Exception {
@@ -483,17 +486,18 @@ public Response deleteAccountIdAccountMember(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/accountMembers/{userId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/accountMembers/{userId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountMember getAccountIdAccountMember(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("userId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("userId")
Long userId)
throws Exception {
@@ -524,18 +528,19 @@ public AccountMember getAccountIdAccountMember(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AccountMember")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/accounts/{id}/accountMembers/{userId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/accounts/{id}/accountMembers/{userId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchAccountIdAccountMember(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("userId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("userId")
Long userId,
AccountMember accountMember)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountOrganizationResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountOrganizationResourceImpl.java
index 94611fb50e7fba..37742263e9a2c3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountOrganizationResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountOrganizationResourceImpl.java
@@ -39,6 +39,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -48,23 +59,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alessio Antonio Rendina
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAccountOrganizationResourceImpl
implements AccountOrganizationResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate {
@@ -99,19 +99,19 @@ public abstract class BaseAccountOrganizationResourceImpl
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountOrganizations"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountOrganizationsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -139,18 +139,18 @@ public abstract class BaseAccountOrganizationResourceImpl
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountOrganizations"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountOrganization
postAccountByExternalReferenceCodeAccountOrganization(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AccountOrganization accountOrganization)
throws Exception {
@@ -184,20 +184,20 @@ public abstract class BaseAccountOrganizationResourceImpl
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountOrganizations/{organizationId}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountByExternalReferenceCodeAccountOrganization(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("organizationId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("organizationId")
Long organizationId)
throws Exception {
@@ -232,21 +232,21 @@ public Response deleteAccountByExternalReferenceCodeAccountOrganization(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountOrganizations/{organizationId}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountOrganization
getAccountByExternalReferenceCodeAccountOrganization(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("organizationId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("organizationId")
Long organizationId)
throws Exception {
@@ -283,15 +283,16 @@ public Response deleteAccountByExternalReferenceCodeAccountOrganization(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/accountOrganizations")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/accountOrganizations")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountOrganizationsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -319,14 +320,15 @@ public Page getAccountIdAccountOrganizationsPage(
)
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts/{id}/accountOrganizations")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts/{id}/accountOrganizations")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountOrganization postAccountIdAccountOrganization(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AccountOrganization accountOrganization)
throws Exception {
@@ -356,14 +358,14 @@ public AccountOrganization postAccountIdAccountOrganization(
)
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/accounts/accountOrganizations/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/accounts/accountOrganizations/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postAccountIdAccountOrganizationBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -410,17 +412,18 @@ public Response postAccountIdAccountOrganizationBatch(
)
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/accounts/{id}/accountOrganizations/{organizationId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/accounts/{id}/accountOrganizations/{organizationId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountIdAccountOrganization(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("organizationId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("organizationId")
Long organizationId)
throws Exception {
@@ -455,17 +458,18 @@ public Response deleteAccountIdAccountOrganization(
)
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/accountOrganizations/{organizationId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/accountOrganizations/{organizationId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AccountOrganization getAccountIdAccountOrganization(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("organizationId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("organizationId")
Long organizationId)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountResourceImpl.java
index 6bd7ee5438f73a..36b5ab0e5220b5 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAccountResourceImpl.java
@@ -41,6 +41,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -50,23 +61,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alessio Antonio Rendina
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAccountResourceImpl
implements AccountResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -90,17 +90,17 @@ public abstract class BaseAccountResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accountGroups/by-externalReferenceCode/{externalReferenceCode}/accounts"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response postAccountGroupByExternalReferenceCodeAccount(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Account account)
throws Exception {
@@ -132,20 +132,20 @@ public Response postAccountGroupByExternalReferenceCodeAccount(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/accountGroups/by-externalReferenceCode/{externalReferenceCode}/accounts/{accountExternalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountGroupByExternalReferenceCodeAccount(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("accountExternalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("accountExternalReferenceCode")
String accountExternalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -188,18 +188,18 @@ public Response deleteAccountGroupByExternalReferenceCodeAccount(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -244,28 +244,28 @@ public Page getAccountsPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/accounts/export-batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/accounts/export-batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postAccountsPageExportBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.DefaultValue("JSON")
- @javax.ws.rs.QueryParam("contentType")
+ @jakarta.ws.rs.DefaultValue("JSON")
+ @jakarta.ws.rs.QueryParam("contentType")
String contentType,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("fieldNames")
+ @jakarta.ws.rs.QueryParam("fieldNames")
String fieldNames)
throws Exception {
@@ -297,10 +297,10 @@ public Response postAccountsPageExportBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accounts")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accounts")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Account postAccount(Account account) throws Exception {
return new Account();
@@ -324,14 +324,14 @@ public Account postAccount(Account account) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/accounts/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/accounts/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postAccountBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -370,16 +370,16 @@ public Response postAccountBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -406,16 +406,16 @@ public Response deleteAccountByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Account getAccountByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -440,17 +440,17 @@ public Account getAccountByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchAccountByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Account account)
throws Exception {
@@ -478,17 +478,17 @@ public Response patchAccountByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes("multipart/form-data")
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes("multipart/form-data")
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/logo"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response postAccountByExternalReferenceCodeLogo(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
MultipartBody multipartBody)
throws Exception {
@@ -516,13 +516,14 @@ public Response postAccountByExternalReferenceCodeLogo(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/accounts/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/accounts/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccount(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -549,14 +550,14 @@ public Response deleteAccount(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/accounts/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/accounts/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteAccountBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -595,13 +596,14 @@ public Response deleteAccountBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Account getAccount(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -626,14 +628,15 @@ public Account getAccount(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/accounts/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/accounts/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchAccount(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
Account account)
throws Exception {
@@ -661,14 +664,15 @@ public Response patchAccount(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Account")}
)
- @javax.ws.rs.Consumes("multipart/form-data")
- @javax.ws.rs.Path("/accounts/{id}/logo")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes("multipart/form-data")
+ @jakarta.ws.rs.Path("/accounts/{id}/logo")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response postAccountLogo(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
MultipartBody multipartBody)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAdminAccountGroupResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAdminAccountGroupResourceImpl.java
index dc0143c8391845..b621fe0896a337 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAdminAccountGroupResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseAdminAccountGroupResourceImpl.java
@@ -38,6 +38,16 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -47,22 +57,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Alessio Antonio Rendina
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAdminAccountGroupResourceImpl
implements AdminAccountGroupResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate {
@@ -103,18 +103,18 @@ public abstract class BaseAdminAccountGroupResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accountGroups")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accountGroups")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountGroupsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -133,10 +133,10 @@ public Page getAccountGroupsPage(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/accountGroups")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/accountGroups")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AdminAccountGroup postAccountGroup(
AdminAccountGroup adminAccountGroup)
@@ -165,16 +165,16 @@ public AdminAccountGroup postAccountGroup(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/accountGroups/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountGroupByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -203,16 +203,16 @@ public Response deleteAccountGroupByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accountGroups/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AdminAccountGroup getAccountGroupByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -239,17 +239,17 @@ public AdminAccountGroup getAccountGroupByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/accountGroups/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchAccountGroupByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AdminAccountGroup adminAccountGroup)
throws Exception {
@@ -279,13 +279,14 @@ public Response patchAccountGroupByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/accountGroups/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/accountGroups/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteAccountGroup(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -314,13 +315,14 @@ public Response deleteAccountGroup(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accountGroups/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accountGroups/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public AdminAccountGroup getAccountGroup(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -347,14 +349,15 @@ public AdminAccountGroup getAccountGroup(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/accountGroups/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/accountGroups/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchAccountGroup(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AdminAccountGroup adminAccountGroup)
throws Exception {
@@ -392,19 +395,19 @@ public Response patchAccountGroup(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountGroups"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getAccountByExternalReferenceCodeAccountGroupsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -438,15 +441,16 @@ public Response patchAccountGroup(
@io.swagger.v3.oas.annotations.tags.Tag(name = "AdminAccountGroup")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/accounts/{id}/accountGroups")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/accounts/{id}/accountGroups")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getAccountIdAccountGroupsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseUserResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseUserResourceImpl.java
index 1f232b5ce0b51a..1365848ac456f3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseUserResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/BaseUserResourceImpl.java
@@ -22,23 +22,23 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* @author Alessio Antonio Rendina
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseUserResourceImpl implements UserResource {
/**
@@ -59,17 +59,17 @@ public abstract class BaseUserResourceImpl implements UserResource {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "User")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/accounts/by-externalReferenceCode/{externalReferenceCode}/accountMembers/createUser"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public User postAccountByExternalReferenceCodeAccountMemberCreateUser(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
User user)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/OpenAPIResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/OpenAPIResourceImpl.java
index 2c735e88c400aa..fc8d05fb19508a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/OpenAPIResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/OpenAPIResourceImpl.java
@@ -11,23 +11,23 @@
import io.swagger.v3.oas.annotations.info.Info;
import io.swagger.v3.oas.annotations.info.License;
-import java.lang.reflect.Method;
+import jakarta.annotation.Generated;
-import java.util.HashSet;
-import java.util.Set;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.annotation.Generated;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.HashSet;
+import java.util.Set;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountAddressResourceFactoryImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountAddressResourceFactoryImpl.java
index b7a7d52931ab34..563404996e3c28 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountAddressResourceFactoryImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountAddressResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountChannelEntryResourceFactoryImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountChannelEntryResourceFactoryImpl.java
index 1c4b2d5adf1a94..5c740ba6c428b1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountChannelEntryResourceFactoryImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountChannelEntryResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountChannelShippingOptionResourceFactoryImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountChannelShippingOptionResourceFactoryImpl.java
index a39b778a4c7eb5..46fae5b573ec98 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountChannelShippingOptionResourceFactoryImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountChannelShippingOptionResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountMemberResourceFactoryImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountMemberResourceFactoryImpl.java
index b2b6e0449b0740..9d43644e9159c9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountMemberResourceFactoryImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountMemberResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountOrganizationResourceFactoryImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountOrganizationResourceFactoryImpl.java
index 18b59540e4d137..e54626788eb38d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountOrganizationResourceFactoryImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountOrganizationResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountResourceFactoryImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountResourceFactoryImpl.java
index 141625fdcc1fe7..e8b30b7aa477b3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountResourceFactoryImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AccountResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AdminAccountGroupResourceFactoryImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AdminAccountGroupResourceFactoryImpl.java
index ae8e9366eaa9a6..a45cae0da78731 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AdminAccountGroupResourceFactoryImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/AdminAccountGroupResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/UserResourceFactoryImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/UserResourceFactoryImpl.java
index e3c7efe1858329..5c88045085a22e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/UserResourceFactoryImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-impl/src/main/java/com/liferay/headless/commerce/admin/account/internal/resource/v1_0/factory/UserResourceFactoryImpl.java
@@ -28,6 +28,13 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
@@ -38,13 +45,6 @@
import java.util.Locale;
import java.util.function.Function;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/build.gradle b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/build.gradle
index 1c664d213a3363..db0c272f6fd765 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/build.gradle
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/build.gradle
@@ -2,12 +2,12 @@ dependencies {
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-core", version: "2.18.2"
testIntegrationImplementation group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.18.2"
+ testIntegrationImplementation group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.test", version: "default"
testIntegrationImplementation group: "com.liferay.portal", name: "com.liferay.portal.test.integration", version: "default"
testIntegrationImplementation group: "commons-lang", name: "commons-lang", version: "2.6"
- testIntegrationImplementation group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- testIntegrationImplementation group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- testIntegrationImplementation group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
+ testIntegrationImplementation group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ testIntegrationImplementation group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
testIntegrationImplementation group: "junit", name: "junit", version: "4.13.1"
testIntegrationImplementation project(":apps:account:account-api")
testIntegrationImplementation project(":apps:commerce:commerce-api")
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountAddressResourceTestCase.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountAddressResourceTestCase.java
index f32c2eca868033..80335575198bbc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountAddressResourceTestCase.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountAddressResourceTestCase.java
@@ -55,6 +55,16 @@
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegateBuilderRegistry;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Method;
import java.net.URI;
@@ -73,16 +83,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountChannelEntryResourceTestCase.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountChannelEntryResourceTestCase.java
index 7e7af00491a5f6..8fd26a0d403fef 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountChannelEntryResourceTestCase.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountChannelEntryResourceTestCase.java
@@ -43,6 +43,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -58,10 +62,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountChannelShippingOptionResourceTestCase.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountChannelShippingOptionResourceTestCase.java
index 05f49ff8d92923..cde7a73efdee92 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountChannelShippingOptionResourceTestCase.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountChannelShippingOptionResourceTestCase.java
@@ -55,6 +55,16 @@
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegateBuilderRegistry;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Method;
import java.net.URI;
@@ -73,16 +83,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountMemberResourceTestCase.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountMemberResourceTestCase.java
index 685a9c4cfebade..c8fc856db399d9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountMemberResourceTestCase.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountMemberResourceTestCase.java
@@ -43,6 +43,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -58,10 +62,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountOrganizationResourceTestCase.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountOrganizationResourceTestCase.java
index ccce182be0e370..02b32ec02c767a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountOrganizationResourceTestCase.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountOrganizationResourceTestCase.java
@@ -43,6 +43,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -58,10 +62,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountResourceTestCase.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountResourceTestCase.java
index 8c77d994edce6b..2dbfa93fdf798e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountResourceTestCase.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAccountResourceTestCase.java
@@ -58,6 +58,16 @@
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegateBuilderRegistry;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.PathSegment;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
+
import java.lang.reflect.Method;
import java.net.URI;
@@ -76,16 +86,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAdminAccountGroupResourceTestCase.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAdminAccountGroupResourceTestCase.java
index bbe61bf940f893..cc0fd85f851a93 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAdminAccountGroupResourceTestCase.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseAdminAccountGroupResourceTestCase.java
@@ -46,6 +46,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -61,10 +65,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseUserResourceTestCase.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseUserResourceTestCase.java
index 326e7742daaa41..7f55f4da81643e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseUserResourceTestCase.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-account-test/src/testIntegration/java/com/liferay/headless/commerce/admin/account/resource/v1_0/test/BaseUserResourceTestCase.java
@@ -40,6 +40,10 @@
import com.liferay.portal.util.PropsValues;
import com.liferay.portal.vulcan.resource.EntityModelResource;
+import jakarta.annotation.Generated;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+
import java.lang.reflect.Method;
import java.text.Format;
@@ -55,10 +59,6 @@
import java.util.Objects;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/build.gradle b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/build.gradle
index 8f5e69a98e3a45..ce2ad05f0d3bd0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/build.gradle
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/build.gradle
@@ -1,13 +1,13 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.github.graphql-java", name: "graphql-java-annotations", version: "9.1"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "javax.xml.bind", name: "jaxb-api", version: "2.3.0"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
+ compileOnly group: "jakarta.xml.bind", name: "jakarta.xml.bind-api", version: "4.0.2"
compileOnly group: "org.osgi", name: "org.osgi.annotation.versioning", version: "1.1.0"
compileOnly project(":apps:portal-odata:portal-odata-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Account.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Account.java
index eb263de163e5ff..23d7b4661afc22 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Account.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Account.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AccountGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AccountGroup.java
index 18bd94662ae10b..91e6ee2e337f79 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AccountGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AccountGroup.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Attachment.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Attachment.java
index 3ac7c053e8e1a9..3a133cb9b63abb 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Attachment.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Attachment.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,13 +35,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AttachmentBase64.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AttachmentBase64.java
index 7eda10f0e8c9c4..d81d3a592a6b73 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AttachmentBase64.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AttachmentBase64.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,13 +35,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AttachmentUrl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AttachmentUrl.java
index ef639da2ab2c0f..afd7068a2cd325 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AttachmentUrl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/AttachmentUrl.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,13 +35,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Catalog.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Catalog.java
index b5c62920db7ae3..24f56375ad0c45 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Catalog.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Catalog.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Category.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Category.java
index 48719773bc41c0..63684babd51afc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Category.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Category.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Channel.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Channel.java
index ed1f51591bab23..70b182da03c0a0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Channel.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Channel.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Currency.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Currency.java
index 37c927fe98bbbd..8caa44d1e6d574 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Currency.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Currency.java
@@ -19,6 +19,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -29,15 +38,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/CustomField.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/CustomField.java
index f2ead3a1738fbd..b8abf83e4023d4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/CustomField.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/CustomField.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/CustomValue.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/CustomValue.java
index 11d1ef4006b1ce..b2d8458ccc8f12 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/CustomValue.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/CustomValue.java
@@ -17,6 +17,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -25,12 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Diagram.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Diagram.java
index 5b0c6c89d3e319..3298103d76ec02 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Diagram.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Diagram.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Error.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Error.java
index 18ba0f8bf9f4ab..875097daf9e949 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Error.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Error.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Geo.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Geo.java
index 16c616cf042fff..5f36c34ce4b313 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Geo.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Geo.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/GroupedProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/GroupedProduct.java
index 08683deaa42c0a..3a93cb13a779c8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/GroupedProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/GroupedProduct.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/LinkedProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/LinkedProduct.java
index 0cf74c1164bfc8..8f202bb6197596 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/LinkedProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/LinkedProduct.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ListTypeDefinition.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ListTypeDefinition.java
index 73b4dd1f55a519..b2a5c55c96661b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ListTypeDefinition.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ListTypeDefinition.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,12 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/LowStockAction.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/LowStockAction.java
index 08f0dcafec3c30..c5d83a5ca9e446 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/LowStockAction.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/LowStockAction.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/MappedProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/MappedProduct.java
index fb6eb47ab704a7..d0d78fa17970f3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/MappedProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/MappedProduct.java
@@ -19,6 +19,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -27,13 +34,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Option.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Option.java
index e0a441fb5183c6..d1c7bbeb8dd187 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Option.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Option.java
@@ -19,6 +19,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -27,15 +36,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OptionCategory.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OptionCategory.java
index 628d2c982ab778..b87ffe4f8dd930 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OptionCategory.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OptionCategory.java
@@ -16,6 +16,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,15 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OptionValue.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OptionValue.java
index 06b7704c88080c..8e425c5cd55616 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OptionValue.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OptionValue.java
@@ -16,6 +16,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,15 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OrderType.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OrderType.java
index cfeb5d85dbcc65..33738156c568ae 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OrderType.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/OrderType.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Pin.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Pin.java
index 61b9edaed0c231..c27e41dcd7df26 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Pin.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Pin.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Product.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Product.java
index 8c306f61c56608..20ef4d909604ac 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Product.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Product.java
@@ -16,6 +16,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,15 +37,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductAccountGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductAccountGroup.java
index 1ad6772b2ce544..86d43a0556a123 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductAccountGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductAccountGroup.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductChannel.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductChannel.java
index b06895188fc5ef..5350acbcb84308 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductChannel.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductChannel.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfiguration.java
index 5c8b4687a6f542..55bd565b271a9c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfiguration.java
@@ -19,6 +19,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -29,13 +36,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationList.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationList.java
index e3d50df183e894..f68782046896e3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationList.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationList.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.text.DateFormat;
@@ -28,13 +35,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListAccount.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListAccount.java
index 672dd3f9ae2bd2..e49c8292ac6ec4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListAccount.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListAccount.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListAccountGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListAccountGroup.java
index e12107547d5701..8507612a278be1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListAccountGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListAccountGroup.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListChannel.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListChannel.java
index e66779473ccde6..1f9642c2c48cca 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListChannel.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListChannel.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListOrderType.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListOrderType.java
index 7226452a3d31cb..213b2cdd6a0092 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListOrderType.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductConfigurationListOrderType.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductGroup.java
index 706ce029deef18..f9d0a22aa541c7 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductGroup.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductGroupProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductGroupProduct.java
index 56dea7ab38d12f..5d2d433d4a4f68 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductGroupProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductGroupProduct.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductOption.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductOption.java
index dfe645f6135309..7ae2d6ed3bc2bd 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductOption.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductOption.java
@@ -16,6 +16,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,15 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductOptionValue.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductOptionValue.java
index bfa6c859e86a5b..948b43ad9ad948 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductOptionValue.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductOptionValue.java
@@ -16,6 +16,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -26,15 +35,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductShippingConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductShippingConfiguration.java
index 8af6a991469470..1bc997dd595c79 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductShippingConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductShippingConfiguration.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -26,13 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductSpecification.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductSpecification.java
index 58d90692170cc0..e801fd2774941b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductSpecification.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductSpecification.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductSubscriptionConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductSubscriptionConfiguration.java
index 63d784bd980b48..4c375f23196d86 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductSubscriptionConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductSubscriptionConfiguration.java
@@ -19,6 +19,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -27,12 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductTaxConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductTaxConfiguration.java
index b326f6f91355cb..ffab5caa05dc3a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductTaxConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductTaxConfiguration.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductVirtualSettings.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductVirtualSettings.java
index 8c3d886182b8ce..aa020899debdbc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductVirtualSettings.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductVirtualSettings.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductVirtualSettingsFileEntry.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductVirtualSettingsFileEntry.java
index 2f78572cc24e80..2b72f196ebbf79 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductVirtualSettingsFileEntry.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/ProductVirtualSettingsFileEntry.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/RelatedProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/RelatedProduct.java
index cad0f95cc5829c..38f5f278e3cca4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/RelatedProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/RelatedProduct.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,14 +32,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Sku.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Sku.java
index 1bf58f5b6b4303..8a00ecd98dde28 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Sku.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Sku.java
@@ -16,6 +16,14 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -30,14 +38,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuOption.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuOption.java
index ebf6f72411b26a..7ece611bb2690e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuOption.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuOption.java
@@ -16,6 +16,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,12 +30,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuSubscriptionConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuSubscriptionConfiguration.java
index c04360515930ea..0e5b5ff7f85d3a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuSubscriptionConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuSubscriptionConfiguration.java
@@ -19,6 +19,12 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -27,12 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuUnitOfMeasure.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuUnitOfMeasure.java
index 54db6c8a586c0a..905544fba76d19 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuUnitOfMeasure.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuUnitOfMeasure.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -26,13 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuVirtualSettings.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuVirtualSettings.java
index f850fb5d3a9503..d4b9dcc141a470 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuVirtualSettings.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuVirtualSettings.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuVirtualSettingsFileEntry.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuVirtualSettingsFileEntry.java
index 77dff48c4be90e..5e424bc7f7dfe3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuVirtualSettingsFileEntry.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/SkuVirtualSettingsFileEntry.java
@@ -16,6 +16,13 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,13 +31,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Specification.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Specification.java
index af80c35bf3ef1c..f5284a1323a535 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Specification.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Specification.java
@@ -16,6 +16,15 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,15 +33,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.validation.Valid;
-import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Status.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Status.java
index e714ff2fa8543a..47e40fa92440b6 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Status.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/dto/v1_0/Status.java
@@ -16,6 +16,10 @@
import com.liferay.portal.vulcan.graphql.annotation.GraphQLName;
import com.liferay.portal.vulcan.util.ObjectMapperUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+
import java.io.Serializable;
import java.util.Iterator;
@@ -24,10 +28,6 @@
import java.util.Set;
import java.util.function.Supplier;
-import javax.annotation.Generated;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/AttachmentResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/AttachmentResource.java
index a3afbf6d82a59a..1c306c4a1c4c7e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/AttachmentResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/AttachmentResource.java
@@ -21,19 +21,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CatalogResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CatalogResource.java
index 4ac65815bdc079..789f0070adb692 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CatalogResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CatalogResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CategoryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CategoryResource.java
index 35b314561225d9..271a47d9580a6d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CategoryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CategoryResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CurrencyResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CurrencyResource.java
index 5b5ce0cc914851..d90afe6a412149 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CurrencyResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/CurrencyResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/DiagramResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/DiagramResource.java
index 89ce72134b6e86..96eb0445b21582 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/DiagramResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/DiagramResource.java
@@ -17,19 +17,19 @@
import com.liferay.portal.vulcan.batch.engine.resource.VulcanBatchEngineExportTaskResource;
import com.liferay.portal.vulcan.batch.engine.resource.VulcanBatchEngineImportTaskResource;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/GroupedProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/GroupedProductResource.java
index ac1745e03e2ec8..a3024868a7e3cc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/GroupedProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/GroupedProductResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/LinkedProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/LinkedProductResource.java
index 91c5d4df79aaaa..a78eb4060aa9fa 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/LinkedProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/LinkedProductResource.java
@@ -19,18 +19,18 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ListTypeDefinitionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ListTypeDefinitionResource.java
index d2a61030a0eb6e..d661f5f93f0600 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ListTypeDefinitionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ListTypeDefinitionResource.java
@@ -18,19 +18,19 @@
import com.liferay.portal.vulcan.batch.engine.resource.VulcanBatchEngineImportTaskResource;
import com.liferay.portal.vulcan.pagination.Page;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/LowStockActionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/LowStockActionResource.java
index 2d9f209f0fe613..393477e4b3512a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/LowStockActionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/LowStockActionResource.java
@@ -18,19 +18,19 @@
import com.liferay.portal.vulcan.batch.engine.resource.VulcanBatchEngineImportTaskResource;
import com.liferay.portal.vulcan.pagination.Page;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/MappedProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/MappedProductResource.java
index 47bc9feff32125..a28588e0c4d058 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/MappedProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/MappedProductResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionCategoryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionCategoryResource.java
index f74e5f1b7e8de6..820b254444c839 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionCategoryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionCategoryResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionResource.java
index b80aded21643b0..f98ad15a61160a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionValueResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionValueResource.java
index de610ad372cb4d..24d8a3c52a2201 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionValueResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/OptionValueResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/PinResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/PinResource.java
index c386dbceef387a..89183a190273d0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/PinResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/PinResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductAccountGroupResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductAccountGroupResource.java
index 8b93c86496f0f8..1b5889070be245 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductAccountGroupResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductAccountGroupResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductChannelResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductChannelResource.java
index 3a7a4610e7d9c9..0818989562547c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductChannelResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductChannelResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListAccountGroupResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListAccountGroupResource.java
index a1202f30b9ef0d..bbb10cf0ea4164 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListAccountGroupResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListAccountGroupResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListAccountResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListAccountResource.java
index aebc193195bb05..1d6a42aa7bae9a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListAccountResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListAccountResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListChannelResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListChannelResource.java
index bd51b9a5335349..2c4dbf26737934 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListChannelResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListChannelResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListOrderTypeResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListOrderTypeResource.java
index f5c84720224353..2648a3ad98e3de 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListOrderTypeResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListOrderTypeResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListResource.java
index 02028b587be2b8..8533342a06add9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationListResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationResource.java
index 7f6a3d37a7566d..f17f38d756b27b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductConfigurationResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductGroupProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductGroupProductResource.java
index b0b3fc5fcd57a5..542d88de52a6cb 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductGroupProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductGroupProductResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductGroupResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductGroupResource.java
index 75e8bd0e8bfd9a..409c4e00655a9e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductGroupResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductGroupResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductOptionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductOptionResource.java
index 6a1c55f4fb6d52..e0b43dd60122d1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductOptionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductOptionResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductOptionValueResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductOptionValueResource.java
index db8ab6806129f0..862edfaf5c0822 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductOptionValueResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductOptionValueResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductResource.java
index fa6762b87f0537..29a1b2279e773b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductShippingConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductShippingConfigurationResource.java
index b59d4647654327..66720a7392f9c3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductShippingConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductShippingConfigurationResource.java
@@ -15,19 +15,19 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductSpecificationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductSpecificationResource.java
index 4b15efb38c67b1..53024e49feb6f2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductSpecificationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductSpecificationResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductSubscriptionConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductSubscriptionConfigurationResource.java
index 078249e2d60a08..5eb3cd8baf7acf 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductSubscriptionConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductSubscriptionConfigurationResource.java
@@ -15,19 +15,19 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductTaxConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductTaxConfigurationResource.java
index 2d1a98b405ca35..e17e74b3ee5ab9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductTaxConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductTaxConfigurationResource.java
@@ -15,19 +15,19 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductVirtualSettingsFileEntryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductVirtualSettingsFileEntryResource.java
index 437a42e14fdaf9..919bbc84f0295b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductVirtualSettingsFileEntryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductVirtualSettingsFileEntryResource.java
@@ -20,19 +20,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductVirtualSettingsResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductVirtualSettingsResource.java
index 66b7a8deed2252..8d0ae9bd409a57 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductVirtualSettingsResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/ProductVirtualSettingsResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/RelatedProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/RelatedProductResource.java
index 5ea2170388a450..c19532144abbbf 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/RelatedProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/RelatedProductResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuResource.java
index f1136ca8d7cec7..ab2a8209c9d26c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuSubscriptionConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuSubscriptionConfigurationResource.java
index a09f557d85cae1..2c111b97b692af 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuSubscriptionConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuSubscriptionConfigurationResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuUnitOfMeasureResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuUnitOfMeasureResource.java
index c35ec3a9faa8b1..389eae2c0491da 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuUnitOfMeasureResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuUnitOfMeasureResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuVirtualSettingsFileEntryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuVirtualSettingsFileEntryResource.java
index 39f326bdebcc49..1b574e31ee10e6 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuVirtualSettingsFileEntryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuVirtualSettingsFileEntryResource.java
@@ -20,19 +20,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuVirtualSettingsResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuVirtualSettingsResource.java
index 4f7dfcddbc578b..fdbc5623f56b6d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuVirtualSettingsResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SkuVirtualSettingsResource.java
@@ -15,18 +15,18 @@
import com.liferay.portal.odata.sort.SortParserProvider;
import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SpecificationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SpecificationResource.java
index b3f9182286d001..271c3b40832031 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SpecificationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/java/com/liferay/headless/commerce/admin/catalog/resource/v1_0/SpecificationResource.java
@@ -19,19 +19,19 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/resources/com/liferay/headless/commerce/admin/catalog/dto/v1_0/packageinfo b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/resources/com/liferay/headless/commerce/admin/catalog/dto/v1_0/packageinfo
index 5b2de3187bc270..061fd0b37b7e23 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/resources/com/liferay/headless/commerce/admin/catalog/dto/v1_0/packageinfo
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/resources/com/liferay/headless/commerce/admin/catalog/dto/v1_0/packageinfo
@@ -1 +1 @@
-version 19.0.0
\ No newline at end of file
+version 19.0.1
\ No newline at end of file
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/resources/com/liferay/headless/commerce/admin/catalog/resource/v1_0/packageinfo b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/resources/com/liferay/headless/commerce/admin/catalog/resource/v1_0/packageinfo
index 4ded2e5136524b..d7a629bf4b3633 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/resources/com/liferay/headless/commerce/admin/catalog/resource/v1_0/packageinfo
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-api/src/main/resources/com/liferay/headless/commerce/admin/catalog/resource/v1_0/packageinfo
@@ -1 +1 @@
-version 21.0.0
\ No newline at end of file
+version 22.0.0
\ No newline at end of file
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/build.gradle b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/build.gradle
index b802e77531117e..1c5c01ff57416f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/build.gradle
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
}
\ No newline at end of file
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/aggregation/Aggregation.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/aggregation/Aggregation.java
index e33c75faf3a2e7..368385f3587c44 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/aggregation/Aggregation.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/aggregation/Aggregation.java
@@ -5,11 +5,11 @@
package com.liferay.headless.commerce.admin.catalog.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/aggregation/Facet.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/aggregation/Facet.java
index 068b8db9ea9c5b..12810782ca7732 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/aggregation/Facet.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/aggregation/Facet.java
@@ -5,11 +5,11 @@
package com.liferay.headless.commerce.admin.catalog.client.aggregation;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Account.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Account.java
index 13d6444f18cae5..9a2fa25a5368ed 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Account.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Account.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.AccountSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AccountGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AccountGroup.java
index f1c20f9ca7b3fe..121530f59dd7a2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AccountGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AccountGroup.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.AccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Attachment.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Attachment.java
index 467137f9b6ff5a..f6e9bc57d6320b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Attachment.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Attachment.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.AttachmentSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AttachmentBase64.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AttachmentBase64.java
index 3b049b09fd717a..47f6ac38daa874 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AttachmentBase64.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AttachmentBase64.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.AttachmentBase64SerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AttachmentUrl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AttachmentUrl.java
index 059a2efb30179c..be2b8fedee6c05 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AttachmentUrl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/AttachmentUrl.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.AttachmentUrlSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Catalog.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Catalog.java
index 8339d7a4810322..afb9e83f4e447a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Catalog.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Catalog.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.CatalogSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Category.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Category.java
index 6687d2e2b3951b..bb0c50fe31fb17 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Category.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Category.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.CategorySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Channel.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Channel.java
index 2e7e8c97809278..037cdcbe3dbe87 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Channel.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Channel.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Currency.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Currency.java
index 7fd5306b50a6a4..0abd0cf05eac56 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Currency.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Currency.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.CurrencySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -15,8 +17,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/CustomField.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/CustomField.java
index 81ece7c372662f..c379303c948de5 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/CustomField.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/CustomField.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.CustomFieldSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/CustomValue.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/CustomValue.java
index 6cf238f42c71e9..d96589f9c7bbdc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/CustomValue.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/CustomValue.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.CustomValueSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Diagram.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Diagram.java
index 8143a64c9125b6..60afc148b84b80 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Diagram.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Diagram.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.DiagramSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Error.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Error.java
index 6a61f018c7dce5..5c503dbec8e93a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Error.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Error.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ErrorSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Geo.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Geo.java
index d1b3b01f6a2bc2..b2e72ca86357a2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Geo.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Geo.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.GeoSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/GroupedProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/GroupedProduct.java
index 15ca0219a36c3c..81c3c2cd0789d0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/GroupedProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/GroupedProduct.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.GroupedProductSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/LinkedProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/LinkedProduct.java
index 7a4bfb164c4d5a..306adb39b2091a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/LinkedProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/LinkedProduct.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.LinkedProductSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ListTypeDefinition.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ListTypeDefinition.java
index 318d2d0a1937b8..b830591fe77603 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ListTypeDefinition.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ListTypeDefinition.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ListTypeDefinitionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/LowStockAction.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/LowStockAction.java
index 6f72d4a26da374..21179af6b26721 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/LowStockAction.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/LowStockAction.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.LowStockActionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/MappedProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/MappedProduct.java
index fc43d52727aa24..1058c3058ef64e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/MappedProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/MappedProduct.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.MappedProductSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Option.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Option.java
index 3e4c9ec8f8e9d4..48cff784b066b1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Option.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Option.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.OptionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OptionCategory.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OptionCategory.java
index a659d1ad71fd3f..172d10a67349e3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OptionCategory.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OptionCategory.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.OptionCategorySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OptionValue.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OptionValue.java
index ecc1ad9953d67f..0129751d3fe8e8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OptionValue.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OptionValue.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.OptionValueSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OrderType.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OrderType.java
index b3ef93a685d9c6..7620bf85655561 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OrderType.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/OrderType.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.OrderTypeSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Pin.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Pin.java
index 4a88b2b25a2800..6c0ba3cf265935 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Pin.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Pin.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.PinSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Product.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Product.java
index 66733212df295a..80ee0a31caf4c4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Product.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Product.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductAccountGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductAccountGroup.java
index 9ad72971e1f3aa..880c936924745c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductAccountGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductAccountGroup.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductAccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductChannel.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductChannel.java
index 09a80390934864..67f69ef10f5f1d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductChannel.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductChannel.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfiguration.java
index 919e142ac1ed94..aa496d9e601969 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfiguration.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -15,8 +17,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationList.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationList.java
index 4160635a68c3e9..6d05a7fb218b2a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationList.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationList.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListAccount.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListAccount.java
index e2bd9ab8a866bb..1c06c4a6ffa11f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListAccount.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListAccount.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListAccountSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListAccountGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListAccountGroup.java
index 22f92e73204ba9..b553f68504ff72 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListAccountGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListAccountGroup.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListAccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListChannel.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListChannel.java
index f19dfc16f1f8ef..69de9a5487a8c4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListChannel.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListChannel.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListOrderType.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListOrderType.java
index f32abaec3bb928..73f6dc243de9fa 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListOrderType.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductConfigurationListOrderType.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListOrderTypeSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductGroup.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductGroup.java
index 500485317973c8..18e804f8f4705a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductGroup.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductGroup.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductGroupProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductGroupProduct.java
index 784e56fa110b12..235d892ccb9d39 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductGroupProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductGroupProduct.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductGroupProductSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductOption.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductOption.java
index 9e3e3fdef27083..77a5b6ac25e056 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductOption.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductOption.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductOptionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductOptionValue.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductOptionValue.java
index f02796fb240468..4712eedb19569a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductOptionValue.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductOptionValue.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductOptionValueSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -15,8 +17,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductShippingConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductShippingConfiguration.java
index 3e9a77630ca2c0..372a9a30d69049 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductShippingConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductShippingConfiguration.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductShippingConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductSpecification.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductSpecification.java
index 29e3c03fd2c18c..973bb2b9e29e6b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductSpecification.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductSpecification.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductSpecificationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductSubscriptionConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductSubscriptionConfiguration.java
index 8912ef36502bb7..b7f7a9ea18d2d0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductSubscriptionConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductSubscriptionConfiguration.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductSubscriptionConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductTaxConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductTaxConfiguration.java
index 9024fdf03ffe74..f62f451c9c2323 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductTaxConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductTaxConfiguration.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductTaxConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductVirtualSettings.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductVirtualSettings.java
index 912c92b34dbca6..fb2ba99d7dfdb6 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductVirtualSettings.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductVirtualSettings.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductVirtualSettingsSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductVirtualSettingsFileEntry.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductVirtualSettingsFileEntry.java
index 54bf9e00b61129..bcb2fd2c4dcf5f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductVirtualSettingsFileEntry.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/ProductVirtualSettingsFileEntry.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductVirtualSettingsFileEntrySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/RelatedProduct.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/RelatedProduct.java
index 460e2314c2ba55..0822597a29c9c4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/RelatedProduct.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/RelatedProduct.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.RelatedProductSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Sku.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Sku.java
index d9ae165df7229e..4ab00055920028 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Sku.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Sku.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -16,8 +18,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuOption.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuOption.java
index 16b4100ce83742..22bf1f0505e6af 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuOption.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuOption.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuOptionSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuSubscriptionConfiguration.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuSubscriptionConfiguration.java
index 490a3a195a938e..6781a04ba108f1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuSubscriptionConfiguration.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuSubscriptionConfiguration.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuSubscriptionConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuUnitOfMeasure.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuUnitOfMeasure.java
index e80c4c3a9f9c23..ff0d99df22be31 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuUnitOfMeasure.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuUnitOfMeasure.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuUnitOfMeasureSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.math.BigDecimal;
@@ -15,8 +17,6 @@
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuVirtualSettings.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuVirtualSettings.java
index 0b44b5d47a0253..0bdcafbf369ae3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuVirtualSettings.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuVirtualSettings.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuVirtualSettingsSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuVirtualSettingsFileEntry.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuVirtualSettingsFileEntry.java
index 38e44ebf3976e9..eff7f8b8206470 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuVirtualSettingsFileEntry.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/SkuVirtualSettingsFileEntry.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuVirtualSettingsFileEntrySerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Specification.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Specification.java
index e1d02ed11a186d..ac185c47f3becd 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Specification.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Specification.java
@@ -8,13 +8,13 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SpecificationSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Status.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Status.java
index a9074922fba72d..64f9414332bec2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Status.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/dto/v1_0/Status.java
@@ -8,12 +8,12 @@
import com.liferay.headless.commerce.admin.catalog.client.function.UnsafeSupplier;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.StatusSerDes;
+import jakarta.annotation.Generated;
+
import java.io.Serializable;
import java.util.Objects;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/function/UnsafeSupplier.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/function/UnsafeSupplier.java
index fbff754bc6accd..6237ef7ad63660 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/function/UnsafeSupplier.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/function/UnsafeSupplier.java
@@ -5,7 +5,7 @@
package com.liferay.headless.commerce.admin.catalog.client.function;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Zoltán Takács
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/http/HttpInvoker.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/http/HttpInvoker.java
index f8b2fb06a81047..e778df160fb486 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/http/HttpInvoker.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/http/HttpInvoker.java
@@ -5,6 +5,8 @@
package com.liferay.headless.commerce.admin.catalog.client.http;
+import jakarta.annotation.Generated;
+
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -29,8 +31,6 @@
import java.util.Set;
import java.util.regex.Matcher;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/json/BaseJSONParser.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/json/BaseJSONParser.java
index 4c8d3cd69b41a4..4bfa76d683280e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/json/BaseJSONParser.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/json/BaseJSONParser.java
@@ -5,6 +5,8 @@
package com.liferay.headless.commerce.admin.catalog.client.json;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -18,8 +20,6 @@
import java.util.Stack;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/pagination/Page.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/pagination/Page.java
index 7169f74b7595b7..b641d18433af95 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/pagination/Page.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/pagination/Page.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.aggregation.Facet;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.function.Function;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/pagination/Pagination.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/pagination/Pagination.java
index 27e1b10c484b21..cc5ba9643c869e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/pagination/Pagination.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/pagination/Pagination.java
@@ -5,7 +5,7 @@
package com.liferay.headless.commerce.admin.catalog.client.pagination;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
/**
* @author Zoltán Takács
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/permission/Permission.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/permission/Permission.java
index c042264e00126a..9fdc63682b1747 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/permission/Permission.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/permission/Permission.java
@@ -7,9 +7,9 @@
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Zoltán Takács
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/problem/Problem.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/problem/Problem.java
index 544f8a0bbb0fd7..570e9b08a60f4b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/problem/Problem.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/problem/Problem.java
@@ -7,9 +7,9 @@
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
-import java.util.Objects;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import java.util.Objects;
/**
* @author Zoltán Takács
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/AttachmentResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/AttachmentResource.java
index bc9b655142d71c..ebf224daba6ec9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/AttachmentResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/AttachmentResource.java
@@ -14,6 +14,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.AttachmentSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -23,8 +25,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CatalogResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CatalogResource.java
index 5cf3c423d31ff6..0175ef1526021e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CatalogResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CatalogResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.CatalogSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CategoryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CategoryResource.java
index 14a8c61210bace..e2364059962c65 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CategoryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CategoryResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.CategorySerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.ArrayList;
@@ -23,8 +25,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CurrencyResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CurrencyResource.java
index 600228f5bd84ca..7ca28e5dbac67c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CurrencyResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/CurrencyResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.CurrencySerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/DiagramResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/DiagramResource.java
index ba8d185cc20fb8..e3855ad2967dcf 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/DiagramResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/DiagramResource.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.http.HttpInvoker;
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/GroupedProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/GroupedProductResource.java
index 861fe7537507ca..30fac41d9aad6e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/GroupedProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/GroupedProductResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.GroupedProductSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/LinkedProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/LinkedProductResource.java
index 4dcf6276d9d283..c9d53a6d792c9c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/LinkedProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/LinkedProductResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.LinkedProductSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ListTypeDefinitionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ListTypeDefinitionResource.java
index 00ea9390cc23ba..0881605f19628c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ListTypeDefinitionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ListTypeDefinitionResource.java
@@ -11,6 +11,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ListTypeDefinitionSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -20,8 +22,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/LowStockActionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/LowStockActionResource.java
index 0469375d07de5b..5fc31f22766d21 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/LowStockActionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/LowStockActionResource.java
@@ -11,6 +11,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.LowStockActionSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -20,8 +22,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/MappedProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/MappedProductResource.java
index f6c4c7f07d1aeb..886948570f3dd9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/MappedProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/MappedProductResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.MappedProductSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionCategoryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionCategoryResource.java
index 2d3d4b8ba6a8f2..0b75d3eb231b7d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionCategoryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionCategoryResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.OptionCategorySerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionResource.java
index 69455f73a4e192..05711a0e36289b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.OptionSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionValueResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionValueResource.java
index 343f5bb860f023..1fd8aa42912837 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionValueResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/OptionValueResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.OptionValueSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/PinResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/PinResource.java
index d414a6e328d08d..ebb2cd956de8aa 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/PinResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/PinResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.PinSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductAccountGroupResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductAccountGroupResource.java
index f14b851c8f1e58..44b18dbeef4ceb 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductAccountGroupResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductAccountGroupResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductAccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductChannelResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductChannelResource.java
index d2a535b4b85796..359ef40df8e75c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductChannelResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductChannelResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListAccountGroupResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListAccountGroupResource.java
index 8527e44a33700a..de8b82f639fe96 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListAccountGroupResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListAccountGroupResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListAccountGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListAccountResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListAccountResource.java
index af0341f92a6240..61d7a3bf410c47 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListAccountResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListAccountResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListAccountSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListChannelResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListChannelResource.java
index 45754b326a7037..3f9006096e9859 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListChannelResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListChannelResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListChannelSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListOrderTypeResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListOrderTypeResource.java
index bddf9238888409..bffe1e8034c161 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListOrderTypeResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListOrderTypeResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListOrderTypeSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListResource.java
index 5d80142e0c8348..132460248a5cb5 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationListResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationListSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationResource.java
index 6e6feff06302ff..cc6f986446ed16 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductConfigurationResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductConfigurationSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductGroupProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductGroupProductResource.java
index b448616406dccc..0384e265b84cc1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductGroupProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductGroupProductResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductGroupProductSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductGroupResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductGroupResource.java
index b7963d2d92dc57..0f11be191806f5 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductGroupResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductGroupResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductGroupSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductOptionResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductOptionResource.java
index 1a273e9ff9530b..864e84cae95ed0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductOptionResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductOptionResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductOptionSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.ArrayList;
@@ -23,8 +25,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductOptionValueResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductOptionValueResource.java
index 12ecf23310497a..dcf4991df61db0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductOptionValueResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductOptionValueResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductOptionValueSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductResource.java
index 6c7915e212ce32..5ae71ea7f6f595 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductShippingConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductShippingConfigurationResource.java
index 5d779eed27cb78..a9ef4cc3770d52 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductShippingConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductShippingConfigurationResource.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.http.HttpInvoker;
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductSpecificationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductSpecificationResource.java
index 3bb5fb3bd91230..767f37bac62ebe 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductSpecificationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductSpecificationResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductSpecificationSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductSubscriptionConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductSubscriptionConfigurationResource.java
index 480a7a34169664..3de4510d3606c3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductSubscriptionConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductSubscriptionConfigurationResource.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.http.HttpInvoker;
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductTaxConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductTaxConfigurationResource.java
index 9c7c0b5e99a79b..cc3f3ef28f751b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductTaxConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductTaxConfigurationResource.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.http.HttpInvoker;
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductVirtualSettingsFileEntryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductVirtualSettingsFileEntryResource.java
index 13db9aa023795b..fe3ed073433f25 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductVirtualSettingsFileEntryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductVirtualSettingsFileEntryResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.ProductVirtualSettingsFileEntrySerDes;
+import jakarta.annotation.Generated;
+
import java.io.File;
import java.net.URL;
@@ -23,8 +25,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductVirtualSettingsResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductVirtualSettingsResource.java
index ba948cdca596a5..3dfc6f0d8a1929 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductVirtualSettingsResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/ProductVirtualSettingsResource.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.http.HttpInvoker;
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/RelatedProductResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/RelatedProductResource.java
index 1c27f2a8f2f552..9f6204a0718324 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/RelatedProductResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/RelatedProductResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.RelatedProductSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuResource.java
index b3c962a8587234..e1aa26d28199ef 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuSubscriptionConfigurationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuSubscriptionConfigurationResource.java
index 7227ee7d37ed3b..0776c4fc536411 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuSubscriptionConfigurationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuSubscriptionConfigurationResource.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.http.HttpInvoker;
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuUnitOfMeasureResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuUnitOfMeasureResource.java
index c1811b8e785a88..a18273b025abab 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuUnitOfMeasureResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuUnitOfMeasureResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuUnitOfMeasureSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuVirtualSettingsFileEntryResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuVirtualSettingsFileEntryResource.java
index ed584d472ed701..e056c7cd2120a0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuVirtualSettingsFileEntryResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuVirtualSettingsFileEntryResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SkuVirtualSettingsFileEntrySerDes;
+import jakarta.annotation.Generated;
+
import java.io.File;
import java.net.URL;
@@ -23,8 +25,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuVirtualSettingsResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuVirtualSettingsResource.java
index b08eda1a0bce39..a6f6dd0c500e7e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuVirtualSettingsResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SkuVirtualSettingsResource.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.http.HttpInvoker;
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -18,8 +20,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SpecificationResource.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SpecificationResource.java
index 2c296305930958..0462364978dbc7 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SpecificationResource.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/resource/v1_0/SpecificationResource.java
@@ -12,6 +12,8 @@
import com.liferay.headless.commerce.admin.catalog.client.problem.Problem;
import com.liferay.headless.commerce.admin.catalog.client.serdes.v1_0.SpecificationSerDes;
+import jakarta.annotation.Generated;
+
import java.net.URL;
import java.util.LinkedHashMap;
@@ -21,8 +23,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AccountGroupSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AccountGroupSerDes.java
index 640f105e5be967..601acfc0dcb785 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AccountGroupSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AccountGroupSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.AccountGroup;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AccountSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AccountSerDes.java
index 170945be915f98..c09661d6fd6206 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AccountSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AccountSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Account;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentBase64SerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentBase64SerDes.java
index 2cdaad9968fede..489084c8a56d35 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentBase64SerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentBase64SerDes.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.CustomField;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -18,8 +20,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentSerDes.java
index a224746ab82621..9f81534806dc76 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentSerDes.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.CustomField;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -18,8 +20,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentUrlSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentUrlSerDes.java
index 012ec1a67b24c8..c14f19dabf8805 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentUrlSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/AttachmentUrlSerDes.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.CustomField;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -18,8 +20,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CatalogSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CatalogSerDes.java
index 6b61a200599964..0628ae4e4b9053 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CatalogSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CatalogSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Catalog;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CategorySerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CategorySerDes.java
index 69758855e23dcb..1ef3dc8171eb8e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CategorySerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CategorySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Category;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ChannelSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ChannelSerDes.java
index e1857ec8de8899..bf2924766ee5fa 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ChannelSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ChannelSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Channel;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CurrencySerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CurrencySerDes.java
index 0bca4b24543697..f761c1a559389a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CurrencySerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CurrencySerDes.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Currency;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.util.Iterator;
@@ -16,8 +18,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CustomFieldSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CustomFieldSerDes.java
index f6854d654b8727..719eaf8afaf148 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CustomFieldSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CustomFieldSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.CustomField;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CustomValueSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CustomValueSerDes.java
index 251a341a3692ae..1d577ffe6719b5 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CustomValueSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/CustomValueSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.CustomValue;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/DiagramSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/DiagramSerDes.java
index fbd45243543ea0..10ddd5ef83d4bd 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/DiagramSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/DiagramSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Diagram;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ErrorSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ErrorSerDes.java
index 3678e7597f4079..0495f7ffbe8c65 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ErrorSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ErrorSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Error;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/GeoSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/GeoSerDes.java
index aa38aea681d6ba..de5530c592c6b0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/GeoSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/GeoSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Geo;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/GroupedProductSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/GroupedProductSerDes.java
index 0299bbddc70baa..997e95127b524f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/GroupedProductSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/GroupedProductSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.GroupedProduct;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/LinkedProductSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/LinkedProductSerDes.java
index 8c26c1899862a6..beef93ed68a6d2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/LinkedProductSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/LinkedProductSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.LinkedProduct;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ListTypeDefinitionSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ListTypeDefinitionSerDes.java
index cdca543aaa36de..93a73fcd064e16 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ListTypeDefinitionSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ListTypeDefinitionSerDes.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ListTypeDefinition;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -17,8 +19,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/LowStockActionSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/LowStockActionSerDes.java
index 76c07d8ef38517..b018c7a65fbe78 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/LowStockActionSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/LowStockActionSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.LowStockAction;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/MappedProductSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/MappedProductSerDes.java
index bc0225b7351cf9..d10643a36e19ce 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/MappedProductSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/MappedProductSerDes.java
@@ -9,14 +9,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.MappedProduct;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionCategorySerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionCategorySerDes.java
index e5b20e8315b271..d20a34ea264ca5 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionCategorySerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionCategorySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.OptionCategory;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionSerDes.java
index b99e62a24c741d..296a8529f8234a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionSerDes.java
@@ -10,14 +10,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.OptionValue;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionValueSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionValueSerDes.java
index cdfed2e2a48bc2..a05f338d5b64b8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionValueSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OptionValueSerDes.java
@@ -9,14 +9,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.OptionValue;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OrderTypeSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OrderTypeSerDes.java
index 03935ff4a4de60..e2015ac10b73dd 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OrderTypeSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/OrderTypeSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.OrderType;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/PinSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/PinSerDes.java
index 4c51533e7f8a7a..799361b0293cd8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/PinSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/PinSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Pin;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductAccountGroupSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductAccountGroupSerDes.java
index 433ab7267ae837..305c02a0a72687 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductAccountGroupSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductAccountGroupSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductAccountGroup;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductChannelSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductChannelSerDes.java
index 489e4602677c80..2a364b1ab713ea 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductChannelSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductChannelSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductChannel;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListAccountGroupSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListAccountGroupSerDes.java
index 1e728a885896ba..77415c32d72068 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListAccountGroupSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListAccountGroupSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductConfigurationListAccountGroup;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListAccountSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListAccountSerDes.java
index a8e5f9d232c6a8..b75cb707b4814d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListAccountSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListAccountSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductConfigurationListAccount;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListChannelSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListChannelSerDes.java
index 0087c160020dca..1ae9f5e30c2902 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListChannelSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListChannelSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductConfigurationListChannel;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListOrderTypeSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListOrderTypeSerDes.java
index 4996f32b3d4df6..966be8b76e5264 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListOrderTypeSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListOrderTypeSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductConfigurationListOrderType;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListSerDes.java
index 077958eafd58a8..923e280afc124e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationListSerDes.java
@@ -9,6 +9,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductConfigurationList;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -18,8 +20,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationSerDes.java
index d698cd042180ba..78c0a691587cb6 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductConfigurationSerDes.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductConfiguration;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.util.Iterator;
@@ -16,8 +18,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductGroupProductSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductGroupProductSerDes.java
index 7cdadfd29b9610..1c1cf885578298 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductGroupProductSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductGroupProductSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductGroupProduct;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductGroupSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductGroupSerDes.java
index 779d11f63fd4b8..be195b2f2ba4dc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductGroupSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductGroupSerDes.java
@@ -9,14 +9,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductGroupProduct;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductOptionSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductOptionSerDes.java
index c0fc555e01ef83..fc8457809fd3c8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductOptionSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductOptionSerDes.java
@@ -10,14 +10,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductOptionValue;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductOptionValueSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductOptionValueSerDes.java
index d7f1c81f0ae29b..526e7b9675aba1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductOptionValueSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductOptionValueSerDes.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductOptionValue;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.util.Iterator;
@@ -16,8 +18,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSerDes.java
index ea64f351f4dbcc..e62cc2dc20db7e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSerDes.java
@@ -20,6 +20,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Sku;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -29,8 +31,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductShippingConfigurationSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductShippingConfigurationSerDes.java
index 84d1f72f7fc52d..92197a89252ed9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductShippingConfigurationSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductShippingConfigurationSerDes.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductShippingConfiguration;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.util.Iterator;
@@ -16,8 +18,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSpecificationSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSpecificationSerDes.java
index 4339b411a42dc6..206f2b86008b96 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSpecificationSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSpecificationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductSpecification;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSubscriptionConfigurationSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSubscriptionConfigurationSerDes.java
index 77c21f143f6bf0..19f5623c2b4c8d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSubscriptionConfigurationSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductSubscriptionConfigurationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductSubscriptionConfiguration;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductTaxConfigurationSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductTaxConfigurationSerDes.java
index 7fb11634576d98..87705a16346225 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductTaxConfigurationSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductTaxConfigurationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductTaxConfiguration;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductVirtualSettingsFileEntrySerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductVirtualSettingsFileEntrySerDes.java
index 95289cf7c192be..f28a1849cd3948 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductVirtualSettingsFileEntrySerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductVirtualSettingsFileEntrySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductVirtualSettingsFileEntry;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductVirtualSettingsSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductVirtualSettingsSerDes.java
index 9565d24d89db38..e77b8dc461d4a6 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductVirtualSettingsSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/ProductVirtualSettingsSerDes.java
@@ -9,14 +9,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.ProductVirtualSettingsFileEntry;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/RelatedProductSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/RelatedProductSerDes.java
index ac41c54fe7bae8..2a2ed11a3794d9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/RelatedProductSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/RelatedProductSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.RelatedProduct;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuOptionSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuOptionSerDes.java
index f55ff948cb2d82..f0713d785d3978 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuOptionSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuOptionSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.SkuOption;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuSerDes.java
index ce1071b245ac23..1ae8b9f0f858f2 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuSerDes.java
@@ -11,6 +11,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.SkuUnitOfMeasure;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -22,8 +24,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuSubscriptionConfigurationSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuSubscriptionConfigurationSerDes.java
index 81e3cc9303ff8a..cb20b7325a3193 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuSubscriptionConfigurationSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuSubscriptionConfigurationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.SkuSubscriptionConfiguration;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuUnitOfMeasureSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuUnitOfMeasureSerDes.java
index 73b2964fa62dc0..172844d2c6fe00 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuUnitOfMeasureSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuUnitOfMeasureSerDes.java
@@ -8,6 +8,8 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.SkuUnitOfMeasure;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.math.BigDecimal;
import java.util.Iterator;
@@ -16,8 +18,6 @@
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuVirtualSettingsFileEntrySerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuVirtualSettingsFileEntrySerDes.java
index 08c5d355c31a10..d3519b94e22beb 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuVirtualSettingsFileEntrySerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuVirtualSettingsFileEntrySerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.SkuVirtualSettingsFileEntry;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuVirtualSettingsSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuVirtualSettingsSerDes.java
index fdbc0e0f7c4790..f36521a63339ba 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuVirtualSettingsSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SkuVirtualSettingsSerDes.java
@@ -9,14 +9,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.SkuVirtualSettingsFileEntry;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SpecificationSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SpecificationSerDes.java
index b327a64e272da2..05716e5856bf84 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SpecificationSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/SpecificationSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Specification;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/StatusSerDes.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/StatusSerDes.java
index bcac443302804e..2886b9de7ea2d5 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/StatusSerDes.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-client/src/main/java/com/liferay/headless/commerce/admin/catalog/client/serdes/v1_0/StatusSerDes.java
@@ -8,14 +8,14 @@
import com.liferay.headless.commerce.admin.catalog.client.dto.v1_0.Status;
import com.liferay.headless.commerce.admin.catalog.client.json.BaseJSONParser;
+import jakarta.annotation.Generated;
+
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Generated;
-
/**
* @author Zoltán Takács
* @generated
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/build.gradle b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/build.gradle
index a11892b6d441ab..87dd13e124e85c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/build.gradle
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/build.gradle
@@ -1,14 +1,14 @@
dependencies {
compileOnly group: "com.fasterxml.jackson.core", name: "jackson-annotations", version: "2.18.2"
+ compileOnly group: "com.liferay", name: "jakarta.ws.rs", version: "3.1.0.LIFERAY-PATCHED-1"
+ compileOnly group: "com.liferay.jakarta.portlet", name: "com.liferay.jakarta.portlet-api", version: "4.0.0"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.impl", version: "default"
compileOnly group: "com.liferay.portal", name: "com.liferay.portal.kernel", version: "default"
compileOnly group: "io.github.graphql-java", name: "graphql-java-annotations", version: "9.1"
compileOnly group: "io.swagger.core.v3", name: "swagger-annotations", version: "2.2.28"
- compileOnly group: "javax.annotation", name: "javax.annotation-api", version: "1.3.2"
- compileOnly group: "javax.portlet", name: "portlet-api", version: "3.0.1"
- compileOnly group: "javax.validation", name: "validation-api", version: "2.0.1.Final"
- compileOnly group: "javax.ws.rs", name: "javax.ws.rs-api", version: "2.1"
- compileOnly group: "org.apache.felix", name: "org.apache.felix.http.servlet-api", version: "1.1.2"
+ compileOnly group: "jakarta.annotation", name: "jakarta.annotation-api", version: "2.1.1"
+ compileOnly group: "jakarta.servlet", name: "jakarta.servlet-api", version: "6.0.0"
+ compileOnly group: "jakarta.validation", name: "jakarta.validation-api", version: "3.1.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component", version: "1.4.0"
compileOnly group: "org.osgi", name: "org.osgi.service.component.annotations", version: "1.4.0"
compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0"
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/dto/v1_0/converter/LinkedProductDTOConverterContext.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/dto/v1_0/converter/LinkedProductDTOConverterContext.java
index 360d0ef69b78d3..39c434ccb58859 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/dto/v1_0/converter/LinkedProductDTOConverterContext.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/dto/v1_0/converter/LinkedProductDTOConverterContext.java
@@ -9,11 +9,11 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Locale;
import java.util.Map;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Stefano Motta
*/
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/dto/v1_0/converter/ProductConfigurationDTOConverterContext.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/dto/v1_0/converter/ProductConfigurationDTOConverterContext.java
index 4e433c13357083..9a37891c8519ee 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/dto/v1_0/converter/ProductConfigurationDTOConverterContext.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/dto/v1_0/converter/ProductConfigurationDTOConverterContext.java
@@ -9,11 +9,11 @@
import com.liferay.portal.vulcan.dto.converter.DTOConverterRegistry;
import com.liferay.portal.vulcan.dto.converter.DefaultDTOConverterContext;
+import jakarta.ws.rs.core.UriInfo;
+
import java.util.Locale;
import java.util.Map;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Andrea Sbarra
*/
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/mutation/v1_0/Mutation.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/mutation/v1_0/Mutation.java
index c0087d8b15d1da..2bf8971437735d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/mutation/v1_0/Mutation.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/mutation/v1_0/Mutation.java
@@ -88,15 +88,15 @@
import com.liferay.portal.vulcan.multipart.MultipartBody;
import com.liferay.portal.vulcan.pagination.Page;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/query/v1_0/Query.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/query/v1_0/Query.java
index 0a2be826c8bec1..a4f5cf05666f57 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/query/v1_0/Query.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/query/v1_0/Query.java
@@ -96,15 +96,15 @@
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
-import java.util.Map;
-import java.util.function.BiFunction;
+import jakarta.annotation.Generated;
-import javax.annotation.Generated;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.UriInfo;
-import javax.ws.rs.core.UriInfo;
+import java.util.Map;
+import java.util.function.BiFunction;
import org.osgi.service.component.ComponentServiceObjects;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/servlet/v1_0/ServletDataImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/servlet/v1_0/ServletDataImpl.java
index 06a419ce1c8a90..63a052bf1fa574 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/servlet/v1_0/ServletDataImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/graphql/servlet/v1_0/ServletDataImpl.java
@@ -90,11 +90,11 @@
import com.liferay.portal.kernel.util.ObjectValuePair;
import com.liferay.portal.vulcan.graphql.servlet.ServletData;
+import jakarta.annotation.Generated;
+
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Generated;
-
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentServiceObjects;
import org.osgi.service.component.annotations.Activate;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/application/HeadlessCommerceAdminCatalogApplication.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/application/HeadlessCommerceAdminCatalogApplication.java
index b9ee25fd72bea3..679343ea4b2a7a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/application/HeadlessCommerceAdminCatalogApplication.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/application/HeadlessCommerceAdminCatalogApplication.java
@@ -5,9 +5,9 @@
package com.liferay.headless.commerce.admin.catalog.internal.jaxrs.application;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
-import javax.ws.rs.core.Application;
+import jakarta.ws.rs.core.Application;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentDisplayDateExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentDisplayDateExceptionMapper.java
index 999fc13eaf5335..3c48b5771a951c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentDisplayDateExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentDisplayDateExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentExpirationDateExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentExpirationDateExceptionMapper.java
index 05de9885ea0dfa..34adf8961c5e0d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentExpirationDateExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentExpirationDateExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentNameExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentNameExceptionMapper.java
index 5b558d40771f5c..7fa2729fd54e96 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentNameExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentNameExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentSizeExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentSizeExceptionMapper.java
index 0f892a32aa15a9..6fdbc0cc256bea 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentSizeExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/AttachmentSizeExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/CatalogAccountStatusExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/CatalogAccountStatusExceptionMapper.java
index 4c750751d45ada..ed2a318c4ad9dc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/CatalogAccountStatusExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/CatalogAccountStatusExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/CatalogAccountTypeExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/CatalogAccountTypeExceptionMapper.java
index 8b666216db7241..9cbbffb1adc88a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/CatalogAccountTypeExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/CatalogAccountTypeExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DefinitionDeliveryMaxSubscriptionCyclesExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DefinitionDeliveryMaxSubscriptionCyclesExceptionMapper.java
index 76805df1e9a9f4..f3f2fcec1f079d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DefinitionDeliveryMaxSubscriptionCyclesExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DefinitionDeliveryMaxSubscriptionCyclesExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DefinitionMaxSubscriptionCyclesExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DefinitionMaxSubscriptionCyclesExceptionMapper.java
index 4d241006f7c105..15b2c2cc450c39 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DefinitionMaxSubscriptionCyclesExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DefinitionMaxSubscriptionCyclesExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateCurrencyExternalReferenceCodeExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateCurrencyExternalReferenceCodeExceptionMapper.java
index 0ba27eaa6df4ed..8f0c4c27e5891c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateCurrencyExternalReferenceCodeExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateCurrencyExternalReferenceCodeExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateGroupedProductExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateGroupedProductExceptionMapper.java
index a5e2923ed8ce3c..6302a26d695cc3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateGroupedProductExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateGroupedProductExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionCategoryKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionCategoryKeyExceptionMapper.java
index b5871a6e3233e9..67cbc541320822 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionCategoryKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionCategoryKeyExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionKeyExceptionMapper.java
index 795138911940c6..19c88d4dd42fce 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionKeyExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionValueKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionValueKeyExceptionMapper.java
index d2f949dbb8fa3f..a20a8ebed4df92 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionValueKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateOptionValueKeyExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductAttachmentExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductAttachmentExceptionMapper.java
index 7068dfa912c253..cad39ab7f99879 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductAttachmentExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductAttachmentExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductGroupProductExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductGroupProductExceptionMapper.java
index 03d09ed842ce6d..1580f05ad4aeb1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductGroupProductExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductGroupProductExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductOptionValueKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductOptionValueKeyExceptionMapper.java
index e6dd8492d9ad21..674cf092b943ff 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductOptionValueKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductOptionValueKeyExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductSpecificationSpecificationKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductSpecificationSpecificationKeyExceptionMapper.java
index d8a59580aaa310..6d7bcb6cf26099 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductSpecificationSpecificationKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateProductSpecificationSpecificationKeyExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateSkuUnitOfMeasureKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateSkuUnitOfMeasureKeyExceptionMapper.java
index ca411d98d1dd6e..6c15261db2e238 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateSkuUnitOfMeasureKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/DuplicateSkuUnitOfMeasureKeyExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/GroupedProductQuantityExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/GroupedProductQuantityExceptionMapper.java
index e83861dc892e05..61576fe87e305d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/GroupedProductQuantityExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/GroupedProductQuantityExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/MalformedURLExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/MalformedURLExceptionMapper.java
index 9fc96cf9b72058..45d38b265ecdd3 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/MalformedURLExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/MalformedURLExceptionMapper.java
@@ -8,9 +8,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import java.net.MalformedURLException;
+import jakarta.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.ExceptionMapper;
+import java.net.MalformedURLException;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueKeyExceptionMapper.java
index 573c987ec10097..6476c2391e9b45 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueKeyExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueNameExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueNameExceptionMapper.java
index abf16f6917d06a..e3972b130eab79 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueNameExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueNameExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueSkuIdExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueSkuIdExceptionMapper.java
index c0af2d2984cbdc..199b222df1da06 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueSkuIdExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/OptionValueSkuIdExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductDeliverySubscriptionLengthExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductDeliverySubscriptionLengthExceptionMapper.java
index 11de591c373d05..e2b74fe514470b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductDeliverySubscriptionLengthExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductDeliverySubscriptionLengthExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductDisplayDateExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductDisplayDateExceptionMapper.java
index c6f175f8ecb99b..f59e120d0fa2b8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductDisplayDateExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductDisplayDateExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductExpirationDateExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductExpirationDateExceptionMapper.java
index 492da1d2bebdd8..b82b349568ed2b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductExpirationDateExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductExpirationDateExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductIgnoreSKUCombinationsExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductIgnoreSKUCombinationsExceptionMapper.java
index 1fa9034d2f4d24..eeb91ec6929ea4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductIgnoreSKUCombinationsExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductIgnoreSKUCombinationsExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaDescriptionExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaDescriptionExceptionMapper.java
index f6ab570999be22..92aed9b662232c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaDescriptionExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaDescriptionExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaKeywordsExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaKeywordsExceptionMapper.java
index 4c6e3d4d187a63..bf452a9232a90a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaKeywordsExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaKeywordsExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaTitleExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaTitleExceptionMapper.java
index 81b6e8fb186923..c85b6db0940c43 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaTitleExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductMetaTitleExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductProductTypeExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductProductTypeExceptionMapper.java
index 2540461dc31916..f30ad89ade7c9e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductProductTypeExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductProductTypeExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationKeyExceptionMapper.java
index dc750e2f27f8b9..b07dd402f70889 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationKeyExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationSpecificationKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationSpecificationKeyExceptionMapper.java
index 52a0707f680857..21c9fc8890014f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationSpecificationKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationSpecificationKeyExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationTitleExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationTitleExceptionMapper.java
index 836b989a9121be..ad78dcf3bb9ca4 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationTitleExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSpecificationTitleExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSubscriptionLengthExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSubscriptionLengthExceptionMapper.java
index 80b1746245da55..2dca636832e993 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSubscriptionLengthExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSubscriptionLengthExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSubscriptionTypeSettingsExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSubscriptionTypeSettingsExceptionMapper.java
index 20e488fcba1dcb..789172f7878014 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSubscriptionTypeSettingsExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductSubscriptionTypeSettingsExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingExceptionMapper.java
index 56fea75859a8cd..3edf603e9e5224 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingSampleExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingSampleExceptionMapper.java
index 266489559c3bc9..9efc1410583d1e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingSampleExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingSampleExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingTermsOfUseArticleIdExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingTermsOfUseArticleIdExceptionMapper.java
index 526714737167ca..b7c796be5c5b00 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingTermsOfUseArticleIdExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingTermsOfUseArticleIdExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingTermsOfUseExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingTermsOfUseExceptionMapper.java
index b587ae1b2d110d..5ef8c9393b9121 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingTermsOfUseExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/ProductVirtualSettingTermsOfUseExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/RequiredCPOptionExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/RequiredCPOptionExceptionMapper.java
index 5a8d7de3092ba5..25f97357f3f3a0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/RequiredCPOptionExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/RequiredCPOptionExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuCostExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuCostExceptionMapper.java
index 060a8a5b25f20c..560dae7ae535e9 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuCostExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuCostExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDeliverySubscriptionLengthExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDeliverySubscriptionLengthExceptionMapper.java
index 7855ed7ae85581..e44c62136e9b4e 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDeliverySubscriptionLengthExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDeliverySubscriptionLengthExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDepthExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDepthExceptionMapper.java
index a637bbb18972b8..460e2cce2e345f 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDepthExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDepthExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDisplayDateExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDisplayDateExceptionMapper.java
index a933f3028a7937..af26131720f969 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDisplayDateExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuDisplayDateExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuExpirationDateExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuExpirationDateExceptionMapper.java
index 17898e4fdee2cd..7271e8b66ef788 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuExpirationDateExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuExpirationDateExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuHeightExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuHeightExceptionMapper.java
index a64bc6f551b5a1..628e2bd19d18d8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuHeightExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuHeightExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuPriceExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuPriceExceptionMapper.java
index b0d087b7215e85..5d39917129b3ff 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuPriceExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuPriceExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuPromoPriceExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuPromoPriceExceptionMapper.java
index d13ec6a42f9c9d..193b95a7e29e91 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuPromoPriceExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuPromoPriceExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSkuExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSkuExceptionMapper.java
index 43aceea4aeb9b7..cd4ae84a0767fc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSkuExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSkuExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSkuOptionsExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSkuOptionsExceptionMapper.java
index 1a09d282bd6e0a..42469f57f939bb 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSkuOptionsExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSkuOptionsExceptionMapper.java
@@ -9,8 +9,8 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSubscriptionLengthExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSubscriptionLengthExceptionMapper.java
index b4c67e50c8d3df..574134dc6ddc5a 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSubscriptionLengthExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuSubscriptionLengthExceptionMapper.java
@@ -9,7 +9,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureBasePriceExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureBasePriceExceptionMapper.java
index 39466364d47e9e..55f65394e1535b 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureBasePriceExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureBasePriceExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureIncrementalOrderQuantityExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureIncrementalOrderQuantityExceptionMapper.java
index 7b06c3d7e9c8cf..031d2b4748ee50 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureIncrementalOrderQuantityExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureIncrementalOrderQuantityExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureKeyExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureKeyExceptionMapper.java
index 0ec8b19693cc8c..7ba43eddba93de 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureKeyExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureKeyExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureNameExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureNameExceptionMapper.java
index 27cee1a487f9a6..07c49fe9d8a707 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureNameExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureNameExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureRateExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureRateExceptionMapper.java
index d4b3ee443782b4..e77a942efdf1fa 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureRateExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuUnitOfMeasureRateExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuWeightExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuWeightExceptionMapper.java
index 040451c9d9c826..0e05ba6d5ac9ee 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuWeightExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuWeightExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuWidthExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuWidthExceptionMapper.java
index 0e207e8120fda7..a219ce7e4f30e0 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuWidthExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/SkuWidthExceptionMapper.java
@@ -9,9 +9,9 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.Provider;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/UnsupportedOperationExceptionMapper.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/UnsupportedOperationExceptionMapper.java
index cd390a7f0a2308..e2f9b5e109e0dc 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/UnsupportedOperationExceptionMapper.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/jaxrs/exception/mapper/UnsupportedOperationExceptionMapper.java
@@ -8,7 +8,7 @@
import com.liferay.portal.vulcan.jaxrs.exception.mapper.BaseExceptionMapper;
import com.liferay.portal.vulcan.jaxrs.exception.mapper.Problem;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.ext.ExceptionMapper;
import org.osgi.service.component.annotations.Component;
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseAttachmentResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseAttachmentResourceImpl.java
index 04295482469ac6..64e700a485005d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseAttachmentResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseAttachmentResourceImpl.java
@@ -40,6 +40,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -49,23 +60,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseAttachmentResourceImpl
implements AttachmentResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate {
@@ -86,16 +86,16 @@ public abstract class BaseAttachmentResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/attachment/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAttachmentByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
}
@@ -116,16 +116,16 @@ public void deleteAttachmentByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/attachment/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment getAttachmentByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -148,17 +148,17 @@ public Attachment getAttachmentByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/attachment/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment patchAttachmentByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Attachment attachment)
throws Exception {
@@ -263,17 +263,17 @@ public Attachment patchAttachmentByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/attachment/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public Attachment putAttachmentByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Attachment attachment)
throws Exception {
@@ -297,13 +297,14 @@ public Attachment putAttachmentByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/attachment/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/attachment/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteAttachment(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -324,14 +325,14 @@ public void deleteAttachment(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/attachment/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/attachment/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteAttachmentBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -376,18 +377,18 @@ public Response deleteAttachmentBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/attachments"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductByExternalReferenceCodeAttachmentsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -409,17 +410,17 @@ public Page getProductByExternalReferenceCodeAttachmentsPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/attachments"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductByExternalReferenceCodeAttachment(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Attachment attachment)
throws Exception {
@@ -443,17 +444,17 @@ public Attachment postProductByExternalReferenceCodeAttachment(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/attachments/by-base64"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductByExternalReferenceCodeAttachmentByBase64(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AttachmentBase64 attachmentBase64)
throws Exception {
@@ -477,17 +478,17 @@ public Attachment postProductByExternalReferenceCodeAttachmentByBase64(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/attachments/by-url"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductByExternalReferenceCodeAttachmentByUrl(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AttachmentUrl attachmentUrl)
throws Exception {
@@ -519,18 +520,18 @@ public Attachment postProductByExternalReferenceCodeAttachmentByUrl(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/images"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductByExternalReferenceCodeImagesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -552,17 +553,17 @@ public Page getProductByExternalReferenceCodeImagesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/images"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductByExternalReferenceCodeImage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Attachment attachment)
throws Exception {
@@ -586,17 +587,17 @@ public Attachment postProductByExternalReferenceCodeImage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/images/by-base64"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductByExternalReferenceCodeImageByBase64(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AttachmentBase64 attachmentBase64)
throws Exception {
@@ -620,17 +621,17 @@ public Attachment postProductByExternalReferenceCodeImageByBase64(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/images/by-url"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductByExternalReferenceCodeImageByUrl(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
AttachmentUrl attachmentUrl)
throws Exception {
@@ -662,15 +663,16 @@ public Attachment postProductByExternalReferenceCodeImageByUrl(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/attachments")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/attachments")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductIdAttachmentsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -692,14 +694,15 @@ public Page getProductIdAttachmentsPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/attachments")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/attachments")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductIdAttachment(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
Attachment attachment)
throws Exception {
@@ -723,14 +726,14 @@ public Attachment postProductIdAttachment(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/products/attachments/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/products/attachments/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postProductIdAttachmentBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -767,14 +770,15 @@ public Response postProductIdAttachmentBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/attachments/by-base64")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/attachments/by-base64")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductIdAttachmentByBase64(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AttachmentBase64 attachmentBase64)
throws Exception {
@@ -798,14 +802,15 @@ public Attachment postProductIdAttachmentByBase64(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/attachments/by-url")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/attachments/by-url")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductIdAttachmentByUrl(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AttachmentUrl attachmentUrl)
throws Exception {
@@ -837,15 +842,16 @@ public Attachment postProductIdAttachmentByUrl(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/images")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/images")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductIdImagesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -867,14 +873,15 @@ public Page getProductIdImagesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/images")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/images")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductIdImage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
Attachment attachment)
throws Exception {
@@ -898,14 +905,15 @@ public Attachment postProductIdImage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/images/by-base64")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/images/by-base64")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductIdImageByBase64(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AttachmentBase64 attachmentBase64)
throws Exception {
@@ -929,14 +937,15 @@ public Attachment postProductIdImageByBase64(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Attachment")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/images/by-url")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/images/by-url")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Attachment postProductIdImageByUrl(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
AttachmentUrl attachmentUrl)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCatalogResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCatalogResourceImpl.java
index 0febd4b7465be3..274778823158b8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCatalogResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCatalogResourceImpl.java
@@ -40,6 +40,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -49,23 +60,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCatalogResourceImpl
implements CatalogResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -87,16 +87,16 @@ public abstract class BaseCatalogResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/catalog/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteCatalogByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -121,16 +121,16 @@ public Response deleteCatalogByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/catalog/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Catalog getCatalogByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -153,17 +153,17 @@ public Catalog getCatalogByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/catalog/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchCatalogByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Catalog catalog)
throws Exception {
@@ -189,17 +189,17 @@ public Response patchCatalogByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/catalog/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public Catalog putCatalogByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Catalog catalog)
throws Exception {
@@ -223,13 +223,14 @@ public Catalog putCatalogByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/catalog/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/catalog/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteCatalog(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -254,14 +255,14 @@ public Response deleteCatalog(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/catalog/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/catalog/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteCatalogBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -298,13 +299,14 @@ public Response deleteCatalogBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/catalog/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/catalog/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Catalog getCatalog(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -327,14 +329,15 @@ public Catalog getCatalog(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/catalog/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/catalog/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchCatalog(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
Catalog catalog)
throws Exception {
@@ -376,18 +379,18 @@ public Response patchCatalog(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/catalogs")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/catalogs")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getCatalogsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -430,28 +433,28 @@ public Page getCatalogsPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/catalogs/export-batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/catalogs/export-batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCatalogsPageExportBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.DefaultValue("JSON")
- @javax.ws.rs.QueryParam("contentType")
+ @jakarta.ws.rs.DefaultValue("JSON")
+ @jakarta.ws.rs.QueryParam("contentType")
String contentType,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("fieldNames")
+ @jakarta.ws.rs.QueryParam("fieldNames")
String fieldNames)
throws Exception {
@@ -481,10 +484,10 @@ public Response postCatalogsPageExportBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/catalogs")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/catalogs")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Catalog postCatalog(Catalog catalog) throws Exception {
return new Catalog();
@@ -506,14 +509,14 @@ public Catalog postCatalog(Catalog catalog) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/catalogs/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/catalogs/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCatalogBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -558,18 +561,18 @@ public Response postCatalogBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/catalog"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Catalog getProductByExternalReferenceCodeCatalog(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return new Catalog();
@@ -599,15 +602,16 @@ public Catalog getProductByExternalReferenceCodeCatalog(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Catalog")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/catalog")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/catalog")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Catalog getProductIdCatalog(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return new Catalog();
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCategoryResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCategoryResourceImpl.java
index bc6ea94811ebf9..4af944ef99b0c8 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCategoryResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCategoryResourceImpl.java
@@ -37,6 +37,16 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -46,22 +56,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCategoryResourceImpl
implements CategoryResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate {
@@ -90,18 +90,18 @@ public abstract class BaseCategoryResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Category")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/categories"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductByExternalReferenceCodeCategoriesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -123,17 +123,17 @@ public Page getProductByExternalReferenceCodeCategoriesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Category")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/categories"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchProductByExternalReferenceCodeCategory(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Category[] categories)
throws Exception {
@@ -167,15 +167,16 @@ public Response patchProductByExternalReferenceCodeCategory(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Category")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/categories")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/categories")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductIdCategoriesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -197,14 +198,15 @@ public Page getProductIdCategoriesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Category")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/products/{id}/categories")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/products/{id}/categories")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchProductIdCategory(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
Category[] categories)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCurrencyResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCurrencyResourceImpl.java
index 7972611e84816f..3469bc4bf051ef 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCurrencyResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseCurrencyResourceImpl.java
@@ -39,6 +39,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -48,23 +59,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseCurrencyResourceImpl
implements CurrencyResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate,
@@ -102,18 +102,18 @@ public abstract class BaseCurrencyResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/currencies")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/currencies")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getCurrenciesPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -156,28 +156,28 @@ public Page getCurrenciesPage(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/currencies/export-batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/currencies/export-batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCurrenciesPageExportBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.DefaultValue("JSON")
- @javax.ws.rs.QueryParam("contentType")
+ @jakarta.ws.rs.DefaultValue("JSON")
+ @jakarta.ws.rs.QueryParam("contentType")
String contentType,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("fieldNames")
+ @jakarta.ws.rs.QueryParam("fieldNames")
String fieldNames)
throws Exception {
@@ -207,10 +207,10 @@ public Response postCurrenciesPageExportBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/currencies")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/currencies")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Currency postCurrency(Currency currency) throws Exception {
return new Currency();
@@ -232,14 +232,14 @@ public Currency postCurrency(Currency currency) throws Exception {
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/currencies/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/currencies/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postCurrencyBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -276,16 +276,16 @@ public Response postCurrencyBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/currencies/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteCurrencyByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
}
@@ -306,16 +306,16 @@ public void deleteCurrencyByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/currencies/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Currency getCurrencyByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -338,17 +338,17 @@ public Currency getCurrencyByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/currencies/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Currency patchCurrencyByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Currency currency)
throws Exception {
@@ -372,13 +372,14 @@ public Currency patchCurrencyByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/currencies/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/currencies/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteCurrency(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
}
@@ -399,14 +400,14 @@ public void deleteCurrency(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/currencies/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/currencies/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteCurrencyBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -443,13 +444,14 @@ public Response deleteCurrencyBatch(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/currencies/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/currencies/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Currency getCurrency(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -472,14 +474,15 @@ public Currency getCurrency(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Currency")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/currencies/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/currencies/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Currency patchCurrency(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
Currency currency)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseDiagramResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseDiagramResourceImpl.java
index 0cbc629356b6ac..3b74e5a16a24a7 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseDiagramResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseDiagramResourceImpl.java
@@ -38,6 +38,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -47,23 +58,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseDiagramResourceImpl
implements DiagramResource, EntityModelResource,
VulcanBatchEngineTaskItemDelegate {
@@ -84,15 +84,15 @@ public abstract class BaseDiagramResourceImpl
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Diagram")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/diagrams/{diagramId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/diagrams/{diagramId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Diagram patchDiagram(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("diagramId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("diagramId")
Long diagramId,
Diagram diagram)
throws Exception {
@@ -116,16 +116,16 @@ public Diagram patchDiagram(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Diagram")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/diagrams"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Diagram getProductByExternalReferenceCodeDiagram(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -148,17 +148,17 @@ public Diagram getProductByExternalReferenceCodeDiagram(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Diagram")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/diagrams"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Diagram postProductByExternalReferenceCodeDiagram(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
Diagram diagram)
throws Exception {
@@ -182,13 +182,14 @@ public Diagram postProductByExternalReferenceCodeDiagram(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Diagram")}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/diagrams")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/diagrams")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Diagram getProductIdDiagram(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -211,14 +212,15 @@ public Diagram getProductIdDiagram(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Diagram")}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/diagrams")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/diagrams")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Diagram postProductIdDiagram(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
Diagram diagram)
throws Exception {
@@ -242,14 +244,14 @@ public Diagram postProductIdDiagram(
@io.swagger.v3.oas.annotations.tags.Tags(
value = {@io.swagger.v3.oas.annotations.tags.Tag(name = "Diagram")}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/products/diagrams/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/products/diagrams/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postProductIdDiagramBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseGroupedProductResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseGroupedProductResourceImpl.java
index 5da575c98f63d6..e4a5b5c22e7a1c 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseGroupedProductResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseGroupedProductResourceImpl.java
@@ -38,6 +38,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -47,23 +58,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseGroupedProductResourceImpl
implements EntityModelResource, GroupedProductResource,
VulcanBatchEngineTaskItemDelegate {
@@ -86,14 +86,14 @@ public abstract class BaseGroupedProductResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "GroupedProduct")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/grouped-products/{groupedProductId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/grouped-products/{groupedProductId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteGroupedProduct(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("groupedProductId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("groupedProductId")
Long groupedProductId)
throws Exception {
}
@@ -116,14 +116,14 @@ public void deleteGroupedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "GroupedProduct")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/grouped-products/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/grouped-products/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteGroupedProductBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -162,15 +162,15 @@ public Response deleteGroupedProductBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "GroupedProduct")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/grouped-products/{groupedProductId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/grouped-products/{groupedProductId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public GroupedProduct patchGroupedProduct(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("groupedProductId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("groupedProductId")
Long groupedProductId,
GroupedProduct groupedProduct)
throws Exception {
@@ -204,19 +204,19 @@ public GroupedProduct patchGroupedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "GroupedProduct")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/grouped-products"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getProductByExternalReferenceCodeGroupedProductsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -240,17 +240,17 @@ public GroupedProduct patchGroupedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "GroupedProduct")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/grouped-products"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public GroupedProduct postProductByExternalReferenceCodeGroupedProduct(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
GroupedProduct groupedProduct)
throws Exception {
@@ -284,15 +284,16 @@ public GroupedProduct postProductByExternalReferenceCodeGroupedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "GroupedProduct")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/grouped-products")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/grouped-products")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductIdGroupedProductsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
@@ -316,14 +317,15 @@ public Page getProductIdGroupedProductsPage(
@io.swagger.v3.oas.annotations.tags.Tag(name = "GroupedProduct")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/grouped-products")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/grouped-products")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public GroupedProduct postProductIdGroupedProduct(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
GroupedProduct groupedProduct)
throws Exception {
@@ -349,14 +351,14 @@ public GroupedProduct postProductIdGroupedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "GroupedProduct")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/products/grouped-products/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/products/grouped-products/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postProductIdGroupedProductBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseLinkedProductResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseLinkedProductResourceImpl.java
index aec37b51d30492..cf96cc36033a7d 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseLinkedProductResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseLinkedProductResourceImpl.java
@@ -37,6 +37,15 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -46,21 +55,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseLinkedProductResourceImpl
implements EntityModelResource, LinkedProductResource,
VulcanBatchEngineTaskItemDelegate {
@@ -91,15 +91,16 @@ public abstract class BaseLinkedProductResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "LinkedProduct")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/linked-products")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/linked-products")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductIdLinkedProductsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
- @javax.ws.rs.core.Context Pagination pagination)
+ @jakarta.ws.rs.core.Context Pagination pagination)
throws Exception {
return Page.of(Collections.emptyList());
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseListTypeDefinitionResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseListTypeDefinitionResourceImpl.java
index 3dc94629b02d47..3b23b5481a82ff 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseListTypeDefinitionResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseListTypeDefinitionResourceImpl.java
@@ -37,6 +37,16 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -46,22 +56,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseListTypeDefinitionResourceImpl
implements EntityModelResource, ListTypeDefinitionResource,
VulcanBatchEngineTaskItemDelegate {
@@ -84,13 +84,14 @@ public abstract class BaseListTypeDefinitionResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "ListTypeDefinition")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/specifications/{id}/list-type-definitions")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/specifications/{id}/list-type-definitions")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getSpecificationIdListTypeDefinitionsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -115,14 +116,15 @@ public Page getSpecificationIdListTypeDefinitionsPage(
@io.swagger.v3.oas.annotations.tags.Tag(name = "ListTypeDefinition")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/specifications/{id}/list-type-definitions")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/specifications/{id}/list-type-definitions")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public ListTypeDefinition postSpecificationIdListTypeDefinition(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
ListTypeDefinition listTypeDefinition)
throws Exception {
@@ -148,14 +150,14 @@ public ListTypeDefinition postSpecificationIdListTypeDefinition(
@io.swagger.v3.oas.annotations.tags.Tag(name = "ListTypeDefinition")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/specifications/list-type-definitions/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/specifications/list-type-definitions/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postSpecificationIdListTypeDefinitionBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -198,20 +200,20 @@ public Response postSpecificationIdListTypeDefinitionBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "ListTypeDefinition")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/specifications/{specificationId}/list-type-definitions/{listTypeDefinitionId}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteSpecificationListTypeDefinition(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("specificationId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("specificationId")
Long specificationId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("listTypeDefinitionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("listTypeDefinitionId")
Long listTypeDefinitionId)
throws Exception {
}
@@ -238,20 +240,20 @@ public void deleteSpecificationListTypeDefinition(
@io.swagger.v3.oas.annotations.tags.Tag(name = "ListTypeDefinition")
}
)
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Path(
"/specifications/{specificationId}/list-type-definitions/{listTypeDefinitionId}"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void postSpecificationListTypeDefinition(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("specificationId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("specificationId")
Long specificationId,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("listTypeDefinitionId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("listTypeDefinitionId")
Long listTypeDefinitionId)
throws Exception {
}
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseLowStockActionResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseLowStockActionResourceImpl.java
index 658d8974a83b2a..a60dec5549d073 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseLowStockActionResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseLowStockActionResourceImpl.java
@@ -37,6 +37,16 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -46,22 +56,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseLowStockActionResourceImpl
implements EntityModelResource, LowStockActionResource,
VulcanBatchEngineTaskItemDelegate {
@@ -79,9 +79,9 @@ public abstract class BaseLowStockActionResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "LowStockAction")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/low-stock-actions")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/low-stock-actions")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getLowStockActionsPage() throws Exception {
return Page.of(Collections.emptyList());
@@ -113,21 +113,21 @@ public Page getLowStockActionsPage() throws Exception {
@io.swagger.v3.oas.annotations.tags.Tag(name = "LowStockAction")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/low-stock-actions/export-batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/low-stock-actions/export-batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postLowStockActionsPageExportBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.DefaultValue("JSON")
- @javax.ws.rs.QueryParam("contentType")
+ @jakarta.ws.rs.DefaultValue("JSON")
+ @jakarta.ws.rs.QueryParam("contentType")
String contentType,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("fieldNames")
+ @jakarta.ws.rs.QueryParam("fieldNames")
String fieldNames)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseMappedProductResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseMappedProductResourceImpl.java
index 668dbc4c96baac..5a7aee43dfd7a7 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseMappedProductResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseMappedProductResourceImpl.java
@@ -38,6 +38,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -47,23 +58,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseMappedProductResourceImpl
implements EntityModelResource, MappedProductResource,
VulcanBatchEngineTaskItemDelegate {
@@ -86,14 +86,14 @@ public abstract class BaseMappedProductResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/mapped-products/{mappedProductId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/mapped-products/{mappedProductId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteMappedProduct(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("mappedProductId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("mappedProductId")
Long mappedProductId)
throws Exception {
}
@@ -116,14 +116,14 @@ public void deleteMappedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/mapped-products/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/mapped-products/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteMappedProductBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -162,15 +162,15 @@ public Response deleteMappedProductBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/mapped-products/{mappedProductId}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/mapped-products/{mappedProductId}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public MappedProduct patchMappedProduct(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("mappedProductId")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("mappedProductId")
Long mappedProductId,
MappedProduct mappedProduct)
throws Exception {
@@ -212,23 +212,23 @@ public MappedProduct patchMappedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/mapped-products"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page
getProductByExternalReferenceCodeMappedProductsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.Sort[] sorts)
throws Exception {
@@ -253,17 +253,17 @@ public MappedProduct patchMappedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/mapped-products"
)
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public MappedProduct postProductByExternalReferenceCodeMappedProduct(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
MappedProduct mappedProduct)
throws Exception {
@@ -293,21 +293,21 @@ public MappedProduct postProductByExternalReferenceCodeMappedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/products/by-externalReferenceCode/{externalReferenceCode}/mapped-products/by-sequence/{sequence}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public MappedProduct
getProductByExternalReferenceCodeMappedProductBySequence(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("sequence")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("sequence")
String sequence)
throws Exception {
@@ -348,19 +348,20 @@ public MappedProduct postProductByExternalReferenceCodeMappedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/mapped-products")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/mapped-products")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getProductIdMappedProductsPage(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("search")
+ @jakarta.ws.rs.QueryParam("search")
String search,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -385,14 +386,15 @@ public Page getProductIdMappedProductsPage(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/products/{id}/mapped-products")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/products/{id}/mapped-products")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public MappedProduct postProductIdMappedProduct(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
MappedProduct mappedProduct)
throws Exception {
@@ -418,14 +420,14 @@ public MappedProduct postProductIdMappedProduct(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/products/mapped-products/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/products/mapped-products/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postProductIdMappedProductBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -468,17 +470,18 @@ public Response postProductIdMappedProductBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "MappedProduct")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/products/{id}/mapped-products/by-sequence/{sequence}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/products/{id}/mapped-products/by-sequence/{sequence}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public MappedProduct getProductIdMappedProductBySequence(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("sequence")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("sequence")
String sequence)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseOptionCategoryResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseOptionCategoryResourceImpl.java
index 546ad29d42d22f..d8adfd3cea2868 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseOptionCategoryResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseOptionCategoryResourceImpl.java
@@ -40,6 +40,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -49,23 +60,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseOptionCategoryResourceImpl
implements EntityModelResource, OptionCategoryResource,
VulcanBatchEngineTaskItemDelegate,
@@ -101,15 +101,15 @@ public abstract class BaseOptionCategoryResourceImpl
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/optionCategories")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/optionCategories")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Page getOptionCategoriesPage(
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context Pagination pagination,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context Pagination pagination,
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts)
throws Exception {
@@ -150,25 +150,25 @@ public Page getOptionCategoriesPage(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/optionCategories/export-batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/optionCategories/export-batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postOptionCategoriesPageExportBatch(
- @javax.ws.rs.core.Context
+ @jakarta.ws.rs.core.Context
com.liferay.portal.kernel.search.filter.Filter filter,
- @javax.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
+ @jakarta.ws.rs.core.Context com.liferay.portal.kernel.search.Sort[]
sorts,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.DefaultValue("JSON")
- @javax.ws.rs.QueryParam("contentType")
+ @jakarta.ws.rs.DefaultValue("JSON")
+ @jakarta.ws.rs.QueryParam("contentType")
String contentType,
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("fieldNames")
+ @jakarta.ws.rs.QueryParam("fieldNames")
String fieldNames)
throws Exception {
@@ -201,10 +201,10 @@ public Response postOptionCategoriesPageExportBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path("/optionCategories")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path("/optionCategories")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public OptionCategory postOptionCategory(OptionCategory optionCategory)
throws Exception {
@@ -230,14 +230,14 @@ public OptionCategory postOptionCategory(OptionCategory optionCategory)
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.Path("/optionCategories/batch")
- @javax.ws.rs.POST
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.Path("/optionCategories/batch")
+ @jakarta.ws.rs.POST
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response postOptionCategoryBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -276,16 +276,16 @@ public Response postOptionCategoryBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path(
"/optionCategories/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public void deleteOptionCategoryByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
}
@@ -308,16 +308,16 @@ public void deleteOptionCategoryByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path(
"/optionCategories/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public OptionCategory getOptionCategoryByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode)
throws Exception {
@@ -342,17 +342,17 @@ public OptionCategory getOptionCategoryByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path(
"/optionCategories/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public OptionCategory patchOptionCategoryByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
OptionCategory optionCategory)
throws Exception {
@@ -406,17 +406,17 @@ public OptionCategory patchOptionCategoryByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.Path(
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.Path(
"/optionCategories/by-externalReferenceCode/{externalReferenceCode}"
)
- @javax.ws.rs.Produces({"application/json", "application/xml"})
- @javax.ws.rs.PUT
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.PUT
@Override
public OptionCategory putOptionCategoryByExternalReferenceCode(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull
- @javax.ws.rs.PathParam("externalReferenceCode")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("externalReferenceCode")
String externalReferenceCode,
OptionCategory optionCategory)
throws Exception {
@@ -442,13 +442,14 @@ public OptionCategory putOptionCategoryByExternalReferenceCode(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/optionCategories/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/optionCategories/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response deleteOptionCategory(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -475,14 +476,14 @@ public Response deleteOptionCategory(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.Consumes("application/json")
- @javax.ws.rs.DELETE
- @javax.ws.rs.Path("/optionCategories/batch")
- @javax.ws.rs.Produces("application/json")
+ @jakarta.ws.rs.Consumes("application/json")
+ @jakarta.ws.rs.DELETE
+ @jakarta.ws.rs.Path("/optionCategories/batch")
+ @jakarta.ws.rs.Produces("application/json")
@Override
public Response deleteOptionCategoryBatch(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.ws.rs.QueryParam("callbackURL")
+ @jakarta.ws.rs.QueryParam("callbackURL")
String callbackURL,
Object object)
throws Exception {
@@ -521,13 +522,14 @@ public Response deleteOptionCategoryBatch(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.GET
- @javax.ws.rs.Path("/optionCategories/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.GET
+ @jakarta.ws.rs.Path("/optionCategories/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public OptionCategory getOptionCategory(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id)
throws Exception {
@@ -552,14 +554,15 @@ public OptionCategory getOptionCategory(
@io.swagger.v3.oas.annotations.tags.Tag(name = "OptionCategory")
}
)
- @javax.ws.rs.Consumes({"application/json", "application/xml"})
- @javax.ws.rs.PATCH
- @javax.ws.rs.Path("/optionCategories/{id}")
- @javax.ws.rs.Produces({"application/json", "application/xml"})
+ @jakarta.ws.rs.Consumes({"application/json", "application/xml"})
+ @jakarta.ws.rs.PATCH
+ @jakarta.ws.rs.Path("/optionCategories/{id}")
+ @jakarta.ws.rs.Produces({"application/json", "application/xml"})
@Override
public Response patchOptionCategory(
@io.swagger.v3.oas.annotations.Parameter(hidden = true)
- @javax.validation.constraints.NotNull @javax.ws.rs.PathParam("id")
+ @jakarta.validation.constraints.NotNull
+ @jakarta.ws.rs.PathParam("id")
Long id,
OptionCategory optionCategory)
throws Exception {
diff --git a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseOptionResourceImpl.java b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseOptionResourceImpl.java
index cfd011b299040f..ef53ff1312bbd1 100644
--- a/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseOptionResourceImpl.java
+++ b/modules/apps/commerce/headless/headless-commerce/headless-commerce-admin-catalog-impl/src/main/java/com/liferay/headless/commerce/admin/catalog/internal/resource/v1_0/BaseOptionResourceImpl.java
@@ -40,6 +40,17 @@
import com.liferay.portal.vulcan.util.ActionUtil;
import com.liferay.portal.vulcan.util.UriInfoUtil;
+import jakarta.annotation.Generated;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import jakarta.ws.rs.NotSupportedException;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
import java.io.Serializable;
import java.util.Collection;
@@ -49,23 +60,12 @@
import java.util.Map;
import java.util.Set;
-import javax.annotation.Generated;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import javax.ws.rs.NotSupportedException;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
/**
* @author Zoltán Takács
* @generated
*/
@Generated("")
-@javax.ws.rs.Path("/v1.0")
+@jakarta.ws.rs.Path("/v1.0")
public abstract class BaseOptionResourceImpl
implements EntityModelResource, OptionResource,
VulcanBatchEngineTaskItemDelegate