diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml index c92ab13430..7feaa58b48 100644 --- a/modules/jaxws/pom.xml +++ b/modules/jaxws/pom.xml @@ -85,7 +85,7 @@ jakarta.xml.bind jakarta.xml.bind-api - + com.sun.xml.ws jaxws-rt @@ -93,6 +93,10 @@ jakarta.xml.ws jakarta.xml.ws-api + + jakarta.servlet + jakarta.servlet-api + commons-io commons-io diff --git a/modules/metadata/pom.xml b/modules/metadata/pom.xml index 0f4e5e682a..9f0bcfd93e 100755 --- a/modules/metadata/pom.xml +++ b/modules/metadata/pom.xml @@ -90,6 +90,10 @@ jakarta.xml.bind jakarta.xml.bind-api + + jakarta.servlet + jakarta.servlet-api + com.sun.xml.ws jaxws-tools diff --git a/modules/saaj/pom.xml b/modules/saaj/pom.xml index 14a1149f0b..8a3fb3f438 100644 --- a/modules/saaj/pom.xml +++ b/modules/saaj/pom.xml @@ -91,9 +91,15 @@ jakarta.servlet jakarta.servlet-api - + org.eclipse.jetty.ee9 jetty-ee9-nested + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + + junit diff --git a/modules/testutils/pom.xml b/modules/testutils/pom.xml index 000e0f55a5..f37fae9f59 100644 --- a/modules/testutils/pom.xml +++ b/modules/testutils/pom.xml @@ -67,9 +67,15 @@ org.eclipse.jetty.ee10 jetty-ee10-webapp - + org.eclipse.jetty.ee9 jetty-ee9-nested + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + + org.bouncycastle diff --git a/modules/transport/http/src/test/java/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java b/modules/transport/http/src/test/java/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java index d30c7a4d13..a3c1e75375 100644 --- a/modules/transport/http/src/test/java/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java +++ b/modules/transport/http/src/test/java/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java @@ -172,16 +172,6 @@ public String encodeRedirectURL(String url) { return null; } - @Override - public String encodeUrl(String url) { - return null; - } - - @Override - public String encodeRedirectUrl(String url) { - return null; - } - @Override public void sendError(int sc, String msg) throws IOException { } @@ -194,6 +184,10 @@ public void sendError(int sc) throws IOException { public void sendRedirect(String location) throws IOException { } + @Override + public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException { + } + @Override public void setHeader(String name, String value) { System.out.println("MockHttpServletResponse.setHeader() , name: " +name+ " , value: " + value); @@ -211,10 +205,6 @@ public void addHeader(String name, String value) { public void setStatus(int sc) { } - @Override - public void setStatus(int sc, String sm) { - } - @Override public String getContentType() { throw new UnsupportedOperationException(); diff --git a/modules/transport/testkit/pom.xml b/modules/transport/testkit/pom.xml index 7d4074d564..7f21c66766 100644 --- a/modules/transport/testkit/pom.xml +++ b/modules/transport/testkit/pom.xml @@ -99,9 +99,15 @@ jakarta.servlet jakarta.servlet-api - + org.eclipse.jetty.ee9 jetty-ee9-nested + + + org.eclipse.jetty.toolchain + jetty-jakarta-servlet-api + + diff --git a/pom.xml b/pom.xml index 55ecbde6fd..967b75a368 100644 --- a/pom.xml +++ b/pom.xml @@ -1278,6 +1278,11 @@ true true + + + org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api + +