Skip to content

Commit ae0b80f

Browse files
ludochgae-java-bot
authored andcommitted
Remove explicit version of jakarta.servlet-api from pom.xml files.
This is to avoid conflicts with the version of jakarta.servlet-api that is included in the Jetty distribution. PiperOrigin-RevId: 631955926 Change-Id: I0bf091cdb5eb7895d3c9608fd34a6598ae6edced
1 parent 7ac5461 commit ae0b80f

File tree

11 files changed

+1
-11
lines changed

11 files changed

+1
-11
lines changed

api/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
<dependency>
149149
<groupId>jakarta.servlet</groupId>
150150
<artifactId>jakarta.servlet-api</artifactId>
151-
<version>6.0.0</version>
152151
</dependency>
153152
</dependencies>
154153
<build>

api_dev/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@
196196
<dependency>
197197
<groupId>jakarta.servlet</groupId>
198198
<artifactId>jakarta.servlet-api</artifactId>
199-
<version>6.0.0</version>
200199
<type>jar</type>
201200
</dependency>
202201
</dependencies>

e2etests/testlocalapps/allinone_jakarta/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<dependency>
4444
<groupId>jakarta.servlet</groupId>
4545
<artifactId>jakarta.servlet-api</artifactId>
46-
<version>6.0.0</version>
4746
<scope>provided</scope>
4847
</dependency>
4948
<dependency>

e2etests/testlocalapps/bundle_standard/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<dependency>
4949
<groupId>jakarta.servlet</groupId>
5050
<artifactId>jakarta.servlet-api</artifactId>
51-
<version>6.0.0</version>
5251
<scope>provided</scope>
5352
</dependency>
5453
</dependencies>

e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<dependency>
4949
<groupId>jakarta.servlet</groupId>
5050
<artifactId>jakarta.servlet-api</artifactId>
51-
<version>6.0.0</version>
5251
<scope>provided</scope>
5352
</dependency>
5453
</dependencies>

e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<dependency>
5353
<groupId>jakarta.servlet</groupId>
5454
<artifactId>jakarta.servlet-api</artifactId>
55-
<version>6.0.0</version>
5655
<scope>provided</scope>
5756
</dependency>
5857
</dependencies>

local_runtime_shared_jetty12/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<dependency>
6565
<groupId>jakarta.servlet</groupId>
6666
<artifactId>jakarta.servlet-api</artifactId>
67-
<version>6.0.0</version>
6867
</dependency>
6968
</dependencies>
7069
<build>

runtime/runtime_impl_jetty12/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
<dependency>
161161
<groupId>jakarta.servlet</groupId>
162162
<artifactId>jakarta.servlet-api</artifactId>
163-
<version>6.0.0</version>
164163
<scope>provided</scope>
165164
</dependency>
166165
<dependency>

runtime/testapps/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<dependency>
4848
<groupId>jakarta.servlet</groupId>
4949
<artifactId>jakarta.servlet-api</artifactId>
50-
<version>6.0.0</version>
5150
</dependency>
5251
<dependency>
5352
<groupId>org.mortbay.jasper</groupId>

runtime_shared_jetty12/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>jakarta.servlet</groupId>
4444
<artifactId>jakarta.servlet-api</artifactId>
45-
<version>4.0.4</version>
45+
<version>4.0.4</version> <!-- Keep, doe not use 6.0.0 as we want javax support there.-->
4646
<optional>true</optional>
4747
</dependency>
4848
<dependency>

0 commit comments

Comments
 (0)