You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2026/04/20 22:10:48 UTC
(sling-org-apache-sling-installer-console) branch master updated: SLING-13167 migrate to jakarta Servlet (#6)
This is an automated email from the ASF dual-hosted git repository.
enapps-enorman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-console.git
The following commit(s) were added to refs/heads/master by this push:
new dfc79ca SLING-13167 migrate to jakarta Servlet (#6)
dfc79ca is described below
commit dfc79cadaf9b84584ea27dc9b9ae5d85f1a19e74
Author: Eric Norman <en...@apache.org>
AuthorDate: Mon Apr 20 15:10:42 2026 -0700
SLING-13167 migrate to jakarta Servlet (#6)
---
pom.xml | 6 ++---
.../impl/console/AbstractWebConsolePlugin.java | 4 ++--
.../console/OsgiInstallerWebConsolePlugin.java | 9 ++++---
.../impl/console/AbstractWebConsolePluginTest.java | 7 +++---
.../console/OsgiInstallerWebConsolePluginTest.java | 28 +++++++++++-----------
5 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4c146ad..f86cea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.junit5</artifactId>
- <version>3.6.0</version>
+ <version>4.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/AbstractWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/AbstractWebConsolePlugin.java
index b06bcc3..48e0e50 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/AbstractWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/AbstractWebConsolePlugin.java
@@ -18,10 +18,10 @@
*/
package org.apache.sling.installer.core.impl.console;
-import javax.servlet.GenericServlet;
-
import java.net.URL;
+import jakarta.servlet.GenericServlet;
+
@SuppressWarnings("serial")
abstract class AbstractWebConsolePlugin extends GenericServlet {
diff --git a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
index 5862bc2..c339f31 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
@@ -18,9 +18,6 @@
*/
package org.apache.sling.installer.core.impl.console;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -30,6 +27,8 @@ import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import org.apache.sling.installer.api.InstallableResource;
import org.apache.sling.installer.api.info.InfoProvider;
import org.apache.sling.installer.api.info.InstallationState;
@@ -44,7 +43,7 @@ import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferencePolicyOption;
@Component(
- service = javax.servlet.Servlet.class,
+ service = jakarta.servlet.Servlet.class,
property = {
Constants.SERVICE_VENDOR + "=The Apache Software Foundation",
Constants.SERVICE_DESCRIPTION + "=Apache Sling OSGi Installer Web Console Plugin",
@@ -205,7 +204,7 @@ public class OsgiInstallerWebConsolePlugin extends AbstractWebConsolePlugin {
getType(first));
bufferedPw.println("</div>");
bufferedPw.println("<table class='nicetable'><tbody>");
- bufferedPw.printf(
+ bufferedPw.print(
"<tr><th>Entity ID</th><th>Digest/Priority</th><th>URL (Version)</th><th>State</th><th>Error</th></tr>");
rt = first.getType();
}
diff --git a/src/test/java/org/apache/sling/installer/core/impl/console/AbstractWebConsolePluginTest.java b/src/test/java/org/apache/sling/installer/core/impl/console/AbstractWebConsolePluginTest.java
index 22d7306..ac63bae 100644
--- a/src/test/java/org/apache/sling/installer/core/impl/console/AbstractWebConsolePluginTest.java
+++ b/src/test/java/org/apache/sling/installer/core/impl/console/AbstractWebConsolePluginTest.java
@@ -18,13 +18,12 @@
*/
package org.apache.sling.installer.core.impl.console;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
import java.io.IOException;
import java.net.URL;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git a/src/test/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePluginTest.java b/src/test/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePluginTest.java
index ce789e8..c6c54b3 100644
--- a/src/test/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePluginTest.java
+++ b/src/test/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePluginTest.java
@@ -34,8 +34,8 @@ import org.apache.sling.installer.api.tasks.ResourceState;
import org.apache.sling.installer.api.tasks.TaskResource;
import org.apache.sling.testing.mock.sling.junit5.SlingContext;
import org.apache.sling.testing.mock.sling.junit5.SlingContextExtension;
-import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
-import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse;
+import org.apache.sling.testing.mock.sling.servlet.MockSlingJakartaHttpServletRequest;
+import org.apache.sling.testing.mock.sling.servlet.MockSlingJakartaHttpServletResponse;
import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -81,8 +81,8 @@ class OsgiInstallerWebConsolePluginTest {
// mock InfoProvider
mockInstallationState();
- final @NotNull MockSlingHttpServletRequest req = context.request();
- final @NotNull MockSlingHttpServletResponse resp = context.response();
+ final @NotNull MockSlingJakartaHttpServletRequest req = context.jakartaRequest();
+ final @NotNull MockSlingJakartaHttpServletResponse resp = context.jakartaResponse();
plugin.service(req, resp);
final String outputAsString = resp.getOutputAsString();
assertNotNull(outputAsString);
@@ -95,8 +95,8 @@ class OsgiInstallerWebConsolePluginTest {
final InstallationState mockInstallationState = mockInstallationState();
mockBasicActiveResources(mockInstallationState);
- final @NotNull MockSlingHttpServletRequest req = context.request();
- final @NotNull MockSlingHttpServletResponse resp = context.response();
+ final @NotNull MockSlingJakartaHttpServletRequest req = context.jakartaRequest();
+ final @NotNull MockSlingJakartaHttpServletResponse resp = context.jakartaResponse();
plugin.service(req, resp);
final String outputAsString = resp.getOutputAsString();
assertNotNull(outputAsString);
@@ -109,8 +109,8 @@ class OsgiInstallerWebConsolePluginTest {
final InstallationState mockInstallationState = mockInstallationState();
mockBasicInstalledResources(mockInstallationState);
- final @NotNull MockSlingHttpServletRequest req = context.request();
- final @NotNull MockSlingHttpServletResponse resp = context.response();
+ final @NotNull MockSlingJakartaHttpServletRequest req = context.jakartaRequest();
+ final @NotNull MockSlingJakartaHttpServletResponse resp = context.jakartaResponse();
plugin.service(req, resp);
final String outputAsString = resp.getOutputAsString();
assertNotNull(outputAsString);
@@ -123,8 +123,8 @@ class OsgiInstallerWebConsolePluginTest {
final InstallationState mockInstallationState = mockInstallationState();
mockBasicUntransformedResources(mockInstallationState);
- final @NotNull MockSlingHttpServletRequest req = context.request();
- final @NotNull MockSlingHttpServletResponse resp = context.response();
+ final @NotNull MockSlingJakartaHttpServletRequest req = context.jakartaRequest();
+ final @NotNull MockSlingJakartaHttpServletResponse resp = context.jakartaResponse();
plugin.service(req, resp);
final String outputAsString = resp.getOutputAsString();
assertNotNull(outputAsString);
@@ -141,7 +141,7 @@ class OsgiInstallerWebConsolePluginTest {
final InstallationState mockInstallationState = mockInstallationState();
mockBasicActiveResources(mockInstallationState);
- final @NotNull MockSlingHttpServletResponse resp = context.response();
+ final @NotNull MockSlingJakartaHttpServletResponse resp = context.jakartaResponse();
final PrintWriter pw = resp.getWriter();
plugin.printConfiguration(pw, mode);
final String outputAsString = resp.getOutputAsString();
@@ -155,7 +155,7 @@ class OsgiInstallerWebConsolePluginTest {
final InstallationState mockInstallationState = mockInstallationState();
mockBasicInstalledResources(mockInstallationState);
- final @NotNull MockSlingHttpServletResponse resp = context.response();
+ final @NotNull MockSlingJakartaHttpServletResponse resp = context.jakartaResponse();
final PrintWriter pw = resp.getWriter();
plugin.printConfiguration(pw, "txt");
final String outputAsString = resp.getOutputAsString();
@@ -169,7 +169,7 @@ class OsgiInstallerWebConsolePluginTest {
final InstallationState mockInstallationState = mockInstallationState();
mockBasicUntransformedResources(mockInstallationState);
- final @NotNull MockSlingHttpServletResponse resp = context.response();
+ final @NotNull MockSlingJakartaHttpServletResponse resp = context.jakartaResponse();
final PrintWriter pw = resp.getWriter();
plugin.printConfiguration(pw, "zip");
final String outputAsString = resp.getOutputAsString();
@@ -179,7 +179,7 @@ class OsgiInstallerWebConsolePluginTest {
@Test
void testPrintConfigurationForInvalidMode() {
- final @NotNull MockSlingHttpServletResponse resp = context.response();
+ final @NotNull MockSlingJakartaHttpServletResponse resp = context.jakartaResponse();
final PrintWriter pw = resp.getWriter();
plugin.printConfiguration(pw, "invalid");
final String outputAsString = resp.getOutputAsString();