Skip to content

Commit 0959698

Browse files
wilkinsonawilkinsona
committed
Upgrade to Jersey 2.28
Closes gh-16114
1 parent d6a869f commit 0959698

File tree

6 files changed

+8
-186
lines changed
  • spring-boot-project

6 files changed

+8
-186
lines changed

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

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,6 @@
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>
106100
</dependency>
107101
<dependency>
108102
<groupId>io.micrometer</groupId>
@@ -301,14 +295,6 @@
301295
<artifactId>jersey-server</artifactId>
302296
<optional>true</optional>
303297
<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>
312298
<exclusion>
313299
<groupId>javax.validation</groupId>
314300
<artifactId>validation-api</artifactId>
@@ -319,12 +305,6 @@
319305
<groupId>org.glassfish.jersey.containers</groupId>
320306
<artifactId>jersey-container-servlet-core</artifactId>
321307
<optional>true</optional>
322-
<exclusions>
323-
<exclusion>
324-
<groupId>javax.ws.rs</groupId>
325-
<artifactId>javax.ws.rs-api</artifactId>
326-
</exclusion>
327-
</exclusions>
328308
</dependency>
329309
<dependency>
330310
<groupId>org.hibernate</groupId>
@@ -572,31 +552,11 @@
572552
<groupId>org.glassfish.jersey.ext</groupId>
573553
<artifactId>jersey-spring4</artifactId>
574554
<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>
589555
</dependency>
590556
<dependency>
591557
<groupId>org.glassfish.jersey.media</groupId>
592558
<artifactId>jersey-media-json-jackson</artifactId>
593559
<scope>test</scope>
594-
<exclusions>
595-
<exclusion>
596-
<groupId>javax.ws.rs</groupId>
597-
<artifactId>javax.ws.rs-api</artifactId>
598-
</exclusion>
599-
</exclusions>
600560
</dependency>
601561
<dependency>
602562
<groupId>org.skyscreamer</groupId>

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,6 @@
149149
<artifactId>jersey-server</artifactId>
150150
<optional>true</optional>
151151
<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>
160152
<exclusion>
161153
<groupId>javax.validation</groupId>
162154
<artifactId>validation-api</artifactId>
@@ -167,12 +159,6 @@
167159
<groupId>org.glassfish.jersey.containers</groupId>
168160
<artifactId>jersey-container-servlet-core</artifactId>
169161
<optional>true</optional>
170-
<exclusions>
171-
<exclusion>
172-
<groupId>javax.ws.rs</groupId>
173-
<artifactId>javax.ws.rs-api</artifactId>
174-
</exclusion>
175-
</exclusions>
176162
</dependency>
177163
<dependency>
178164
<groupId>org.hibernate.validator</groupId>
@@ -354,12 +340,6 @@
354340
<groupId>org.glassfish.jersey.media</groupId>
355341
<artifactId>jersey-media-json-jackson</artifactId>
356342
<scope>test</scope>
357-
<exclusions>
358-
<exclusion>
359-
<groupId>javax.ws.rs</groupId>
360-
<artifactId>javax.ws.rs-api</artifactId>
361-
</exclusion>
362-
</exclusions>
363343
</dependency>
364344
<dependency>
365345
<groupId>com.jayway.jsonpath</groupId>
@@ -386,14 +366,6 @@
386366
<artifactId>jersey-spring4</artifactId>
387367
<scope>test</scope>
388368
<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>
397369
<exclusion>
398370
<groupId>javax.validation</groupId>
399371
<artifactId>validation-api</artifactId>

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,6 @@
153153
<artifactId>jersey-server</artifactId>
154154
<optional>true</optional>
155155
<exclusions>
156-
<exclusion>
157-
<groupId>javax.annotation</groupId>
158-
<artifactId>javax.annotation-api</artifactId>
159-
</exclusion>
160-
<exclusion>
161-
<groupId>javax.ws.rs</groupId>
162-
<artifactId>javax.ws.rs-api</artifactId>
163-
</exclusion>
164156
<exclusion>
165157
<groupId>javax.validation</groupId>
166158
<artifactId>validation-api</artifactId>
@@ -171,23 +163,11 @@
171163
<groupId>org.glassfish.jersey.containers</groupId>
172164
<artifactId>jersey-container-servlet-core</artifactId>
173165
<optional>true</optional>
174-
<exclusions>
175-
<exclusion>
176-
<groupId>javax.ws.rs</groupId>
177-
<artifactId>javax.ws.rs-api</artifactId>
178-
</exclusion>
179-
</exclusions>
180166
</dependency>
181167
<dependency>
182168
<groupId>org.glassfish.jersey.containers</groupId>
183169
<artifactId>jersey-container-servlet</artifactId>
184170
<optional>true</optional>
185-
<exclusions>
186-
<exclusion>
187-
<groupId>javax.ws.rs</groupId>
188-
<artifactId>javax.ws.rs-api</artifactId>
189-
</exclusion>
190-
</exclusions>
191171
</dependency>
192172
<dependency>
193173
<groupId>org.glassfish.jersey.ext</groupId>
@@ -202,26 +182,12 @@
202182
<groupId>org.hibernate</groupId>
203183
<artifactId>hibernate-validator</artifactId>
204184
</exclusion>
205-
<exclusion>
206-
<groupId>javax.annotation</groupId>
207-
<artifactId>javax.annotation-api</artifactId>
208-
</exclusion>
209-
<exclusion>
210-
<groupId>javax.ws.rs</groupId>
211-
<artifactId>javax.ws.rs-api</artifactId>
212-
</exclusion>
213185
</exclusions>
214186
</dependency>
215187
<dependency>
216188
<groupId>org.glassfish.jersey.media</groupId>
217189
<artifactId>jersey-media-json-jackson</artifactId>
218190
<optional>true</optional>
219-
<exclusions>
220-
<exclusion>
221-
<groupId>javax.ws.rs</groupId>
222-
<artifactId>javax.ws.rs-api</artifactId>
223-
</exclusion>
224-
</exclusions>
225191
</dependency>
226192
<dependency>
227193
<groupId>org.apache.activemq</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
118118
<jdom2.version>2.0.6</jdom2.version>
119119
<jedis.version>3.0.1</jedis.version>
120-
<jersey.version>2.27</jersey.version>
120+
<jersey.version>2.28</jersey.version>
121121
<jest.version>6.3.1</jest.version>
122122
<jetty.version>9.4.14.v20181114</jetty.version>
123123
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>

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

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,6 @@
229229
<groupId>io.micrometer</groupId>
230230
<artifactId>micrometer-jersey2</artifactId>
231231
<optional>true</optional>
232-
<exclusions>
233-
<exclusion>
234-
<groupId>javax.annotation</groupId>
235-
<artifactId>javax.annotation-api</artifactId>
236-
</exclusion>
237-
</exclusions>
238232
</dependency>
239233
<dependency>
240234
<groupId>io.micrometer</groupId>
@@ -633,14 +627,6 @@
633627
<artifactId>jersey-container-servlet-core</artifactId>
634628
<optional>true</optional>
635629
<exclusions>
636-
<exclusion>
637-
<groupId>javax.annotation</groupId>
638-
<artifactId>javax.annotation-api</artifactId>
639-
</exclusion>
640-
<exclusion>
641-
<groupId>javax.ws.rs</groupId>
642-
<artifactId>javax.ws.rs-api</artifactId>
643-
</exclusion>
644630
<exclusion>
645631
<groupId>javax.validation</groupId>
646632
<artifactId>validation-api</artifactId>
@@ -651,31 +637,11 @@
651637
<groupId>org.glassfish.jersey.ext</groupId>
652638
<artifactId>jersey-spring4</artifactId>
653639
<optional>true</optional>
654-
<exclusions>
655-
<exclusion>
656-
<groupId>javax.annotation</groupId>
657-
<artifactId>javax.annotation-api</artifactId>
658-
</exclusion>
659-
<exclusion>
660-
<groupId>javax.ws.rs</groupId>
661-
<artifactId>javax.ws.rs-api</artifactId>
662-
</exclusion>
663-
<exclusion>
664-
<groupId>javax.validation</groupId>
665-
<artifactId>validation-api</artifactId>
666-
</exclusion>
667-
</exclusions>
668640
</dependency>
669641
<dependency>
670642
<groupId>org.glassfish.jersey.media</groupId>
671643
<artifactId>jersey-media-json-jackson</artifactId>
672644
<optional>true</optional>
673-
<exclusions>
674-
<exclusion>
675-
<groupId>javax.ws.rs</groupId>
676-
<artifactId>javax.ws.rs-api</artifactId>
677-
</exclusion>
678-
</exclusions>
679645
</dependency>
680646
<dependency>
681647
<groupId>org.hamcrest</groupId>

‎spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml

Lines changed: 7 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,10 @@
4343
<groupId>org.glassfish.jersey.core</groupId>
4444
<artifactId>jersey-server</artifactId>
4545
<exclusions>
46-
<exclusion>
47-
<groupId>javax.annotation</groupId>
48-
<artifactId>javax.annotation-api</artifactId>
49-
</exclusion>
5046
<exclusion>
5147
<groupId>javax.validation</groupId>
5248
<artifactId>validation-api</artifactId>
5349
</exclusion>
54-
<exclusion>
55-
<groupId>javax.ws.rs</groupId>
56-
<artifactId>javax.ws.rs-api</artifactId>
57-
</exclusion>
58-
<exclusion>
59-
<groupId>org.glassfish.hk2.external</groupId>
60-
<artifactId>javax.inject</artifactId>
61-
</exclusion>
6250
</exclusions>
6351
</dependency>
6452
<dependency>
@@ -67,11 +55,7 @@
6755
<exclusions>
6856
<exclusion>
6957
<groupId>org.glassfish.hk2.external</groupId>
70-
<artifactId>javax.inject</artifactId>
71-
</exclusion>
72-
<exclusion>
73-
<groupId>javax.ws.rs</groupId>
74-
<artifactId>javax.ws.rs-api</artifactId>
58+
<artifactId>jakarta.inject</artifactId>
7559
</exclusion>
7660
</exclusions>
7761
</dependency>
@@ -89,44 +73,28 @@
8973
<groupId>org.glassfish.jersey.ext</groupId>
9074
<artifactId>jersey-bean-validation</artifactId>
9175
<exclusions>
92-
<exclusion>
93-
<groupId>javax.el</groupId>
94-
<artifactId>javax.el-api</artifactId>
95-
</exclusion>
96-
<exclusion>
97-
<groupId>javax.ws.rs</groupId>
98-
<artifactId>javax.ws.rs-api</artifactId>
99-
</exclusion>
10076
<exclusion>
10177
<groupId>javax.validation</groupId>
10278
<artifactId>validation-api</artifactId>
10379
</exclusion>
10480
<exclusion>
105-
<groupId>org.glassfish.web</groupId>
106-
<artifactId>javax.el</artifactId>
107-
</exclusion>
108-
<exclusion>
109-
<groupId>org.glassfish.hk2.external</groupId>
110-
<artifactId>javax.inject</artifactId>
81+
<groupId>org.glassfish</groupId>
82+
<artifactId>jakarta.el</artifactId>
11183
</exclusion>
11284
<exclusion>
11385
<groupId>org.hibernate</groupId>
11486
<artifactId>hibernate-validator</artifactId>
11587
</exclusion>
88+
<exclusion>
89+
<groupId>jakarta.el</groupId>
90+
<artifactId>jakarta.el-api</artifactId>
91+
</exclusion>
11692
</exclusions>
11793
</dependency>
11894
<dependency>
11995
<groupId>org.glassfish.jersey.ext</groupId>
12096
<artifactId>jersey-spring4</artifactId>
12197
<exclusions>
122-
<exclusion>
123-
<groupId>javax.annotation</groupId>
124-
<artifactId>javax.annotation-api</artifactId>
125-
</exclusion>
126-
<exclusion>
127-
<groupId>javax.ws.rs</groupId>
128-
<artifactId>javax.ws.rs-api</artifactId>
129-
</exclusion>
13098
<exclusion>
13199
<groupId>org.jvnet</groupId>
132100
<artifactId>tiger-types</artifactId>
@@ -135,10 +103,6 @@
135103
<groupId>org.glassfish.hk2.external</groupId>
136104
<artifactId>bean-validator</artifactId>
137105
</exclusion>
138-
<exclusion>
139-
<groupId>org.glassfish.hk2.external</groupId>
140-
<artifactId>javax.inject</artifactId>
141-
</exclusion>
142106
<exclusion>
143107
<groupId>org.hibernate</groupId>
144108
<artifactId>hibernate-validator</artifactId>
@@ -148,12 +112,6 @@
148112
<dependency>
149113
<groupId>org.glassfish.jersey.media</groupId>
150114
<artifactId>jersey-media-json-jackson</artifactId>
151-
<exclusions>
152-
<exclusion>
153-
<groupId>javax.ws.rs</groupId>
154-
<artifactId>javax.ws.rs-api</artifactId>
155-
</exclusion>
156-
</exclusions>
157115
</dependency>
158116
</dependencies>
159117
<build>

0 commit comments

Comments
 (0)