Skip to content

Commit d6a869f

Browse files
wilkinsonawilkinsona
committed
Switch to Jakarta EE API dependencies where possible
Closes gh-16113 Closes gh-16112 Closes gh-16111 Closes gh-15916 Closes gh-15689
1 parent ce9626d commit d6a869f

File tree

86 files changed

+1214
-274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1214
-274
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml

+102-9
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</dependency>
6666
<dependency>
6767
<groupId>com.sun.mail</groupId>
68-
<artifactId>javax.mail</artifactId>
68+
<artifactId>jakarta.mail</artifactId>
6969
<optional>true</optional>
7070
</dependency>
7171
<dependency>
@@ -97,6 +97,12 @@
9797
<groupId>io.micrometer</groupId>
9898
<artifactId>micrometer-jersey2</artifactId>
9999
<optional>true</optional>
100+
<exclusions>
101+
<exclusion>
102+
<groupId>javax.annotation</groupId>
103+
<artifactId>javax.annotation-api</artifactId>
104+
</exclusion>
105+
</exclusions>
100106
</dependency>
101107
<dependency>
102108
<groupId>io.micrometer</groupId>
@@ -194,18 +200,28 @@
194200
<optional>true</optional>
195201
</dependency>
196202
<dependency>
197-
<groupId>javax.cache</groupId>
198-
<artifactId>cache-api</artifactId>
203+
<groupId>jakarta.jms</groupId>
204+
<artifactId>jakarta.jms-api</artifactId>
205+
<optional>true</optional>
206+
</dependency>
207+
<dependency>
208+
<groupId>jakarta.servlet</groupId>
209+
<artifactId>jakarta.servlet-api</artifactId>
210+
<optional>true</optional>
211+
</dependency>
212+
<dependency>
213+
<groupId>jakarta.persistence</groupId>
214+
<artifactId>jakarta.persistence-api</artifactId>
199215
<optional>true</optional>
200216
</dependency>
201217
<dependency>
202-
<groupId>javax.jms</groupId>
203-
<artifactId>javax.jms-api</artifactId>
218+
<groupId>jakarta.ws.rs</groupId>
219+
<artifactId>jakarta.ws.rs-api</artifactId>
204220
<optional>true</optional>
205221
</dependency>
206222
<dependency>
207-
<groupId>javax.servlet</groupId>
208-
<artifactId>javax.servlet-api</artifactId>
223+
<groupId>javax.cache</groupId>
224+
<artifactId>cache-api</artifactId>
209225
<optional>true</optional>
210226
</dependency>
211227
<dependency>
@@ -258,6 +274,12 @@
258274
<groupId>org.eclipse.jetty</groupId>
259275
<artifactId>jetty-server</artifactId>
260276
<optional>true</optional>
277+
<exclusions>
278+
<exclusion>
279+
<groupId>javax.servlet</groupId>
280+
<artifactId>javax.servlet-api</artifactId>
281+
</exclusion>
282+
</exclusions>
261283
</dependency>
262284
<dependency>
263285
<groupId>org.elasticsearch</groupId>
@@ -278,21 +300,61 @@
278300
<groupId>org.glassfish.jersey.core</groupId>
279301
<artifactId>jersey-server</artifactId>
280302
<optional>true</optional>
303+
<exclusions>
304+
<exclusion>
305+
<groupId>javax.annotation</groupId>
306+
<artifactId>javax.annotation-api</artifactId>
307+
</exclusion>
308+
<exclusion>
309+
<groupId>javax.ws.rs</groupId>
310+
<artifactId>javax.ws.rs-api</artifactId>
311+
</exclusion>
312+
<exclusion>
313+
<groupId>javax.validation</groupId>
314+
<artifactId>validation-api</artifactId>
315+
</exclusion>
316+
</exclusions>
281317
</dependency>
282318
<dependency>
283319
<groupId>org.glassfish.jersey.containers</groupId>
284320
<artifactId>jersey-container-servlet-core</artifactId>
285321
<optional>true</optional>
322+
<exclusions>
323+
<exclusion>
324+
<groupId>javax.ws.rs</groupId>
325+
<artifactId>javax.ws.rs-api</artifactId>
326+
</exclusion>
327+
</exclusions>
286328
</dependency>
287329
<dependency>
288330
<groupId>org.hibernate</groupId>
289331
<artifactId>hibernate-core</artifactId>
290332
<optional>true</optional>
333+
<exclusions>
334+
<exclusion>
335+
<groupId>javax.activation</groupId>
336+
<artifactId>javax.activation-api</artifactId>
337+
</exclusion>
338+
<exclusion>
339+
<groupId>javax.xml.bind</groupId>
340+
<artifactId>jaxb-api</artifactId>
341+
</exclusion>
342+
<exclusion>
343+
<groupId>javax.persistence</groupId>
344+
<artifactId>javax.persistence-api</artifactId>
345+
</exclusion>
346+
</exclusions>
291347
</dependency>
292348
<dependency>
293349
<groupId>org.hibernate.validator</groupId>
294350
<artifactId>hibernate-validator</artifactId>
295351
<optional>true</optional>
352+
<exclusions>
353+
<exclusion>
354+
<groupId>javax.validation</groupId>
355+
<artifactId>validation-api</artifactId>
356+
</exclusion>
357+
</exclusions>
296358
</dependency>
297359
<dependency>
298360
<groupId>org.influxdb</groupId>
@@ -477,8 +539,13 @@
477539
</exclusions>
478540
</dependency>
479541
<dependency>
480-
<groupId>javax.xml.bind</groupId>
481-
<artifactId>jaxb-api</artifactId>
542+
<groupId>jakarta.validation</groupId>
543+
<artifactId>jakarta.validation-api</artifactId>
544+
<scope>test</scope>
545+
</dependency>
546+
<dependency>
547+
<groupId>jakarta.xml.bind</groupId>
548+
<artifactId>jakarta.xml.bind-api</artifactId>
482549
<scope>test</scope>
483550
</dependency>
484551
<dependency>
@@ -505,11 +572,31 @@
505572
<groupId>org.glassfish.jersey.ext</groupId>
506573
<artifactId>jersey-spring4</artifactId>
507574
<scope>test</scope>
575+
<exclusions>
576+
<exclusion>
577+
<groupId>javax.annotation</groupId>
578+
<artifactId>javax.annotation-api</artifactId>
579+
</exclusion>
580+
<exclusion>
581+
<groupId>javax.ws.rs</groupId>
582+
<artifactId>javax.ws.rs-api</artifactId>
583+
</exclusion>
584+
<exclusion>
585+
<groupId>javax.validation</groupId>
586+
<artifactId>validation-api</artifactId>
587+
</exclusion>
588+
</exclusions>
508589
</dependency>
509590
<dependency>
510591
<groupId>org.glassfish.jersey.media</groupId>
511592
<artifactId>jersey-media-json-jackson</artifactId>
512593
<scope>test</scope>
594+
<exclusions>
595+
<exclusion>
596+
<groupId>javax.ws.rs</groupId>
597+
<artifactId>javax.ws.rs-api</artifactId>
598+
</exclusion>
599+
</exclusions>
513600
</dependency>
514601
<dependency>
515602
<groupId>org.skyscreamer</groupId>
@@ -540,6 +627,12 @@
540627
<groupId>org.springframework.restdocs</groupId>
541628
<artifactId>spring-restdocs-mockmvc</artifactId>
542629
<scope>test</scope>
630+
<exclusions>
631+
<exclusion>
632+
<groupId>javax.servlet</groupId>
633+
<artifactId>javax.servlet-api</artifactId>
634+
</exclusion>
635+
</exclusions>
543636
</dependency>
544637
<dependency>
545638
<groupId>org.springframework.restdocs</groupId>

‎spring-boot-project/spring-boot-actuator/pom.xml

+67-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</dependency>
4040
<dependency>
4141
<groupId>com.sun.mail</groupId>
42-
<artifactId>javax.mail</artifactId>
42+
<artifactId>jakarta.mail</artifactId>
4343
<optional>true</optional>
4444
</dependency>
4545
<dependency>
@@ -99,8 +99,13 @@
9999
<optional>true</optional>
100100
</dependency>
101101
<dependency>
102-
<groupId>javax.jms</groupId>
103-
<artifactId>javax.jms-api</artifactId>
102+
<groupId>jakarta.jms</groupId>
103+
<artifactId>jakarta.jms-api</artifactId>
104+
<optional>true</optional>
105+
</dependency>
106+
<dependency>
107+
<groupId>jakarta.ws.rs</groupId>
108+
<artifactId>jakarta.ws.rs-api</artifactId>
104109
<optional>true</optional>
105110
</dependency>
106111
<dependency>
@@ -122,6 +127,12 @@
122127
<groupId>org.eclipse.jetty</groupId>
123128
<artifactId>jetty-server</artifactId>
124129
<optional>true</optional>
130+
<exclusions>
131+
<exclusion>
132+
<groupId>javax.servlet</groupId>
133+
<artifactId>javax.servlet-api</artifactId>
134+
</exclusion>
135+
</exclusions>
125136
</dependency>
126137
<dependency>
127138
<groupId>org.elasticsearch</groupId>
@@ -137,16 +148,42 @@
137148
<groupId>org.glassfish.jersey.core</groupId>
138149
<artifactId>jersey-server</artifactId>
139150
<optional>true</optional>
151+
<exclusions>
152+
<exclusion>
153+
<groupId>javax.annotation</groupId>
154+
<artifactId>javax.annotation-api</artifactId>
155+
</exclusion>
156+
<exclusion>
157+
<groupId>javax.ws.rs</groupId>
158+
<artifactId>javax.ws.rs-api</artifactId>
159+
</exclusion>
160+
<exclusion>
161+
<groupId>javax.validation</groupId>
162+
<artifactId>validation-api</artifactId>
163+
</exclusion>
164+
</exclusions>
140165
</dependency>
141166
<dependency>
142167
<groupId>org.glassfish.jersey.containers</groupId>
143168
<artifactId>jersey-container-servlet-core</artifactId>
144169
<optional>true</optional>
170+
<exclusions>
171+
<exclusion>
172+
<groupId>javax.ws.rs</groupId>
173+
<artifactId>javax.ws.rs-api</artifactId>
174+
</exclusion>
175+
</exclusions>
145176
</dependency>
146177
<dependency>
147178
<groupId>org.hibernate.validator</groupId>
148179
<artifactId>hibernate-validator</artifactId>
149180
<optional>true</optional>
181+
<exclusions>
182+
<exclusion>
183+
<groupId>javax.validation</groupId>
184+
<artifactId>validation-api</artifactId>
185+
</exclusion>
186+
</exclusions>
150187
</dependency>
151188
<dependency>
152189
<groupId>org.infinispan</groupId>
@@ -299,8 +336,13 @@
299336
<scope>test</scope>
300337
</dependency>
301338
<dependency>
302-
<groupId>javax.xml.bind</groupId>
303-
<artifactId>jaxb-api</artifactId>
339+
<groupId>jakarta.validation</groupId>
340+
<artifactId>jakarta.validation-api</artifactId>
341+
<scope>test</scope>
342+
</dependency>
343+
<dependency>
344+
<groupId>jakarta.xml.bind</groupId>
345+
<artifactId>jakarta.xml.bind-api</artifactId>
304346
<scope>test</scope>
305347
</dependency>
306348
<dependency>
@@ -312,6 +354,12 @@
312354
<groupId>org.glassfish.jersey.media</groupId>
313355
<artifactId>jersey-media-json-jackson</artifactId>
314356
<scope>test</scope>
357+
<exclusions>
358+
<exclusion>
359+
<groupId>javax.ws.rs</groupId>
360+
<artifactId>javax.ws.rs-api</artifactId>
361+
</exclusion>
362+
</exclusions>
315363
</dependency>
316364
<dependency>
317365
<groupId>com.jayway.jsonpath</groupId>
@@ -337,6 +385,20 @@
337385
<groupId>org.glassfish.jersey.ext</groupId>
338386
<artifactId>jersey-spring4</artifactId>
339387
<scope>test</scope>
388+
<exclusions>
389+
<exclusion>
390+
<groupId>javax.annotation</groupId>
391+
<artifactId>javax.annotation-api</artifactId>
392+
</exclusion>
393+
<exclusion>
394+
<groupId>javax.ws.rs</groupId>
395+
<artifactId>javax.ws.rs-api</artifactId>
396+
</exclusion>
397+
<exclusion>
398+
<groupId>javax.validation</groupId>
399+
<artifactId>validation-api</artifactId>
400+
</exclusion>
401+
</exclusions>
340402
</dependency>
341403
<dependency>
342404
<groupId>org.skyscreamer</groupId>

0 commit comments

Comments
 (0)