Skip to content

Commit 75cca87

Browse files
committed
chore: exclude org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api, harden build
this is a duplicate dependency of `jakarta.servlet:jakarta.servlet-api`, having duplicate classes should be avoided.
1 parent 2907da0 commit 75cca87

File tree

6 files changed

+35
-4
lines changed

6 files changed

+35
-4
lines changed

modules/jaxws/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,18 @@
8585
<groupId>jakarta.xml.bind</groupId>
8686
<artifactId>jakarta.xml.bind-api</artifactId>
8787
</dependency>
88-
<dependency>
88+
<dependency>
8989
<groupId>com.sun.xml.ws</groupId>
9090
<artifactId>jaxws-rt</artifactId>
9191
</dependency>
9292
<dependency>
9393
<groupId>jakarta.xml.ws</groupId>
9494
<artifactId>jakarta.xml.ws-api</artifactId>
9595
</dependency>
96+
<dependency>
97+
<groupId>jakarta.servlet</groupId>
98+
<artifactId>jakarta.servlet-api</artifactId>
99+
</dependency>
96100
<dependency>
97101
<groupId>commons-io</groupId>
98102
<artifactId>commons-io</artifactId>

modules/metadata/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@
9090
<groupId>jakarta.xml.bind</groupId>
9191
<artifactId>jakarta.xml.bind-api</artifactId>
9292
</dependency>
93+
<dependency>
94+
<groupId>jakarta.servlet</groupId>
95+
<artifactId>jakarta.servlet-api</artifactId>
96+
</dependency>
9397
<dependency>
9498
<groupId>com.sun.xml.ws</groupId>
9599
<artifactId>jaxws-tools</artifactId>

modules/saaj/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,15 @@
9191
<groupId>jakarta.servlet</groupId>
9292
<artifactId>jakarta.servlet-api</artifactId>
9393
</dependency>
94-
<dependency>
94+
<dependency>
9595
<groupId>org.eclipse.jetty.ee9</groupId>
9696
<artifactId>jetty-ee9-nested</artifactId>
97+
<exclusions>
98+
<exclusion>
99+
<groupId>org.eclipse.jetty.toolchain</groupId>
100+
<artifactId>jetty-jakarta-servlet-api</artifactId>
101+
</exclusion>
102+
</exclusions>
97103
</dependency>
98104
<dependency>
99105
<groupId>junit</groupId>

modules/testutils/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,15 @@
6767
<groupId>org.eclipse.jetty.ee10</groupId>
6868
<artifactId>jetty-ee10-webapp</artifactId>
6969
</dependency>
70-
<dependency>
70+
<dependency>
7171
<groupId>org.eclipse.jetty.ee9</groupId>
7272
<artifactId>jetty-ee9-nested</artifactId>
73+
<exclusions>
74+
<exclusion>
75+
<groupId>org.eclipse.jetty.toolchain</groupId>
76+
<artifactId>jetty-jakarta-servlet-api</artifactId>
77+
</exclusion>
78+
</exclusions>
7379
</dependency>
7480
<dependency>
7581
<groupId>org.bouncycastle</groupId>

modules/transport/testkit/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,15 @@
9999
<groupId>jakarta.servlet</groupId>
100100
<artifactId>jakarta.servlet-api</artifactId>
101101
</dependency>
102-
<dependency>
102+
<dependency>
103103
<groupId>org.eclipse.jetty.ee9</groupId>
104104
<artifactId>jetty-ee9-nested</artifactId>
105+
<exclusions>
106+
<exclusion>
107+
<groupId>org.eclipse.jetty.toolchain</groupId>
108+
<artifactId>jetty-jakarta-servlet-api</artifactId>
109+
</exclusion>
110+
</exclusions>
105111
</dependency>
106112
</dependencies>
107113

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,6 +1278,11 @@
12781278
<allowSnapshotRepositories>true</allowSnapshotRepositories>
12791279
<allowSnapshotPluginRepositories>true</allowSnapshotPluginRepositories>
12801280
</requireNoRepositories>
1281+
<bannedDependencies>
1282+
<excludes>
1283+
<exclude>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api</exclude>
1284+
</excludes>
1285+
</bannedDependencies>
12811286
</rules>
12821287
</configuration>
12831288
</execution>

0 commit comments

Comments
 (0)