Skip to content

exclude org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertlazarski merged 2 commits into from
Feb 21, 2025
Merged

exclude org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75cca87
chore: exclude `org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api…
cortlepp Feb 21, 2025
9a8085a
fix: MockHttpServletResponse incompatible with HttpServletResponse
cortlepp Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion modules/jaxws/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions modules/metadata/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion modules/saaj/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion modules/testutils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 4 additions & 14 deletions ...port/http/src/test/java/org/apache/axis2/transport/http/mock/MockHttpServletResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
}
Expand All @@ -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);
Expand All @@ -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();
Expand Down
8 changes: 7 additions & 1 deletion modules/transport/testkit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down