diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 4bbf4dd8020..7f67bce7ed9 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -58,12 +58,6 @@ - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-httpclient - 3.1_7 - compile - commons-io commons-io diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 27fc86ac1e6..4ef9d193562 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -348,18 +348,6 @@ - - commons-fileupload - commons-fileupload - 1.3.3 - compile - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.commons-httpclient - 3.1_7 - compile - commons-io commons-io diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthorizePageServlet.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthorizePageServlet.java index 6277b0c1397..a82dd2c21ed 100644 --- a/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthorizePageServlet.java +++ b/bundles/org.openhab.core.io.http.auth/src/main/java/org/openhab/core/io/http/auth/internal/AuthorizePageServlet.java @@ -28,10 +28,10 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.core.HttpHeaders; -import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.io.IOUtils; import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.Nullable; +import org.eclipse.jetty.http.HttpStatus; import org.openhab.core.auth.Authentication; import org.openhab.core.auth.AuthenticationException; import org.openhab.core.auth.AuthenticationProvider; @@ -232,7 +232,7 @@ protected void doPost(@Nullable HttpServletRequest req, @Nullable HttpServletRes String state = params.containsKey("state") ? params.get("state")[0] : null; resp.addHeader(HttpHeaders.LOCATION, getRedirectUri(baseRedirectUri, authorizationCode, null, state)); - resp.setStatus(HttpStatus.SC_MOVED_TEMPORARILY); + resp.setStatus(HttpStatus.MOVED_TEMPORARILY_302); } catch (AuthenticationException e) { lastAuthenticationFailure = Instant.now(); authenticationFailureCount += 1; @@ -247,7 +247,7 @@ protected void doPost(@Nullable HttpServletRequest req, @Nullable HttpServletRes String state = params.containsKey("state") ? params.get("state")[0] : null; if (baseRedirectUri != null) { resp.addHeader(HttpHeaders.LOCATION, getRedirectUri(baseRedirectUri, null, e.getMessage(), state)); - resp.setStatus(HttpStatus.SC_MOVED_TEMPORARILY); + resp.setStatus(HttpStatus.MOVED_TEMPORARILY_302); } else { resp.setContentType("text/plain;charset=UTF-8"); resp.getWriter().append(e.getMessage());