diff --git a/adapters/oidc/pom.xml b/adapters/oidc/pom.xml index f4e37273be..a41e5584d9 100755 --- a/adapters/oidc/pom.xml +++ b/adapters/oidc/pom.xml @@ -29,11 +29,10 @@ keycloak-oidc-client-adapter-pom pom - adapter-core installed - jaxrs-oauth-client + diff --git a/adapters/saml/pom.xml b/adapters/saml/pom.xml index f941cc0876..26293784a0 100755 --- a/adapters/saml/pom.xml +++ b/adapters/saml/pom.xml @@ -33,9 +33,9 @@ core-public core - jetty - undertow - tomcat + + wildfly servlet-filter jakarta-servlet-filter diff --git a/adapters/saml/servlet-filter/pom.xml b/adapters/saml/servlet-filter/pom.xml index 1c7a330714..394f6467fe 100755 --- a/adapters/saml/servlet-filter/pom.xml +++ b/adapters/saml/servlet-filter/pom.xml @@ -68,9 +68,8 @@ keycloak-crypto-default - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - provided + jakarta.servlet + jakarta.servlet-api junit diff --git a/adapters/saml/wildfly-elytron/pom.xml b/adapters/saml/wildfly-elytron/pom.xml index 5dfaf1bb6e..6bc9f3de4f 100755 --- a/adapters/saml/wildfly-elytron/pom.xml +++ b/adapters/saml/wildfly-elytron/pom.xml @@ -67,9 +67,8 @@ provided - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec - provided + jakarta.servlet + jakarta.servlet-api org.wildfly.security diff --git a/adapters/spi/pom.xml b/adapters/spi/pom.xml index 6bd05d9b41..157a555563 100755 --- a/adapters/spi/pom.xml +++ b/adapters/spi/pom.xml @@ -32,11 +32,11 @@ adapter-spi - tomcat-adapter-spi + undertow-adapter-spi servlet-adapter-spi jakarta-servlet-adapter-spi jboss-adapter-core - jetty-adapter-spi + diff --git a/adapters/spi/servlet-adapter-spi/pom.xml b/adapters/spi/servlet-adapter-spi/pom.xml index 2d8f0ca1f6..abf8a522e2 100755 --- a/adapters/spi/servlet-adapter-spi/pom.xml +++ b/adapters/spi/servlet-adapter-spi/pom.xml @@ -54,8 +54,8 @@ keycloak-common - org.jboss.spec.javax.servlet - jboss-servlet-api_3.0_spec + jakarta.servlet + jakarta.servlet-api provided diff --git a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java index b519d59d3f..369fdb4d16 100755 --- a/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java +++ b/adapters/spi/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java @@ -17,6 +17,7 @@ package org.keycloak.adapters.servlet; +import jakarta.servlet.ReadListener; import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.KeycloakAccount; @@ -174,6 +175,21 @@ public class FilterSessionStore implements AdapterSessionStore { if (needRequestRestore && body != null) { final ByteArrayInputStream is = new ByteArrayInputStream(body); return new ServletInputStream() { + @Override + public boolean isFinished() { + return false; + } + + @Override + public boolean isReady() { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) { + + } + @Override public int read() throws IOException { return is.read(); diff --git a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java index c406751d41..497854d9bc 100755 --- a/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java +++ b/adapters/spi/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java @@ -27,6 +27,7 @@ import io.undertow.servlet.handlers.ServletRequestContext; import io.undertow.util.AttachmentKey; import io.undertow.util.Headers; import io.undertow.util.HttpString; +import jakarta.servlet.ReadListener; import org.keycloak.adapters.spi.AuthenticationError; import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.spi.LogoutError; @@ -201,6 +202,22 @@ public class UndertowHttpFacade implements HttpFacade { public ServletInputStream getInputStream() { inputStream.mark(0); return new ServletInputStream() { + //TODO + @Override + public boolean isFinished() { + return false; + } + + @Override + public boolean isReady() { + return false; + } + + @Override + public void setReadListener(ReadListener readListener) { + + } + @Override public int read() throws IOException { return inputStream.read();