Merge pull request #859 from cortlepp/cortlepp/exclude-shaded-jakarta-servlet-api

exclude `org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api`

Author: robertlazarski

modules/jaxws/pom.xml

@@ -85,14 +85,18 @@
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
-	<dependency>
+	    <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-rt</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

modules/metadata/pom.xml

@@ -90,6 +90,10 @@
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.ws</groupId>
             <artifactId>jaxws-tools</artifactId>

modules/saaj/pom.xml

@@ -91,9 +91,15 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
-	<dependency>
+	    <dependency>
             <groupId>org.eclipse.jetty.ee9</groupId>
             <artifactId>jetty-ee9-nested</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-jakarta-servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

modules/testutils/pom.xml

@@ -67,9 +67,15 @@
             <groupId>org.eclipse.jetty.ee10</groupId>
             <artifactId>jetty-ee10-webapp</artifactId>
         </dependency>
-	<dependency>
+	    <dependency>
             <groupId>org.eclipse.jetty.ee9</groupId>
             <artifactId>jetty-ee9-nested</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-jakarta-servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>

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();

modules/transport/testkit/pom.xml

@@ -99,9 +99,15 @@
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
-	<dependency>
+	    <dependency>
             <groupId>org.eclipse.jetty.ee9</groupId>
             <artifactId>jetty-ee9-nested</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-jakarta-servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

pom.xml

@@ -1278,6 +1278,11 @@
                                     <allowSnapshotRepositories>true</allowSnapshotRepositories>
                                     <allowSnapshotPluginRepositories>true</allowSnapshotPluginRepositories>
                                 </requireNoRepositories>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api</exclude>
+                                    </excludes>
+                                </bannedDependencies>
                             </rules>
                         </configuration>
                     </execution>