Skip to content

Commit 14447f0

Browse files
authored
Bump jersey to latest 2.x and 3.x versions (#3307)
Bump jersey to latest 3.x version
1 parent a4b24dc commit 14447f0

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed

conjure-java-jersey-server/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.palantir.external-publish-jar'
22
apply plugin: 'com.palantir.metric-schema'
33

4-
def jerseyVersion = '2.40'
4+
def jerseyVersion = '2.47'
55

66
versionsLock {
77
disableJavaPluginDefaults()
@@ -45,6 +45,8 @@ dependencies {
4545
version {
4646
strictly jerseyVersion
4747
}
48+
// This conflicts with org.glassfish:jakarta.el (which contains the same classes), when at the version requested by 2.40
49+
exclude group: 'jakarta.el', module: 'jakarta.el-api'
4850
}
4951
runtimeOnly 'org.glassfish.jersey.inject:jersey-hk2', {
5052
version {

versions.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
com.fasterxml:classmate:1.5.1 (1 constraints: 9a122a13)
44

5-
com.fasterxml.jackson.core:jackson-annotations:2.20 (12 constraints: 5bde2209)
5+
com.fasterxml.jackson.core:jackson-annotations:2.20 (12 constraints: 5ede2d09)
66

77
com.fasterxml.jackson.core:jackson-core:2.20.0 (14 constraints: 8b2332d3)
88

9-
com.fasterxml.jackson.core:jackson-databind:2.20.0 (18 constraints: 8963cd17)
9+
com.fasterxml.jackson.core:jackson-databind:2.20.0 (18 constraints: 8c63d817)
1010

1111
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.20.0 (2 constraints: 2520c704)
1212

@@ -24,7 +24,7 @@ com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.20.0 (1 constraints:
2424

2525
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-cbor-provider:2.20.0 (1 constraints: 3605333b)
2626

27-
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.0 (2 constraints: dd304fb2)
27+
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.20.0 (2 constraints: e0305ab2)
2828

2929
com.fasterxml.jackson.module:jackson-module-scala_2.12:2.20.0 (1 constraints: 3605333b)
3030

@@ -118,19 +118,19 @@ com.thoughtworks.paranamer:paranamer:2.8.3 (1 constraints: dc154900)
118118

119119
io.dropwizard.metrics:metrics-core:4.2.37 (6 constraints: 1f586933)
120120

121-
jakarta.activation:jakarta.activation-api:2.1.0 (1 constraints: 8c0f4791)
121+
jakarta.activation:jakarta.activation-api:2.1.3 (1 constraints: 8f0f4a91)
122122

123123
jakarta.annotation:jakarta.annotation-api:2.1.1 (4 constraints: f4368043)
124124

125-
jakarta.el:jakarta.el-api:5.0.1 (2 constraints: eb1eda9a)
125+
jakarta.el:jakarta.el-api:5.0.1 (1 constraints: fe135c65)
126126

127127
jakarta.inject:jakarta.inject-api:2.0.1 (5 constraints: 82605b36)
128128

129129
jakarta.validation:jakarta.validation-api:3.0.2 (2 constraints: fa24a2e0)
130130

131131
jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 (8 constraints: 8c8c036d)
132132

133-
jakarta.xml.bind:jakarta.xml.bind-api:4.0.0 (2 constraints: 3a33f1c3)
133+
jakarta.xml.bind:jakarta.xml.bind-api:4.0.2 (2 constraints: 3c33f3c3)
134134

135135
joda-time:joda-time:2.12.7 (1 constraints: 2f16b1f1)
136136

@@ -144,37 +144,37 @@ org.eclipse.collections:eclipse-collections:13.0.0 (1 constraints: 1c1091a9)
144144

145145
org.eclipse.collections:eclipse-collections-api:13.0.0 (2 constraints: fa22df26)
146146

147-
org.glassfish:jakarta.el:5.0.0-M1 (1 constraints: a814a4a2)
147+
org.glassfish.expressly:expressly:5.0.0 (1 constraints: fd135b65)
148148

149-
org.glassfish.hk2:hk2-api:3.0.4 (1 constraints: 6c0c580c)
149+
org.glassfish.hk2:hk2-api:3.0.6 (1 constraints: 6e0c5a0c)
150150

151-
org.glassfish.hk2:hk2-locator:3.0.4 (1 constraints: 4210d6ad)
151+
org.glassfish.hk2:hk2-locator:3.0.6 (1 constraints: 4410d8ad)
152152

153-
org.glassfish.hk2:hk2-utils:3.0.4 (2 constraints: 1d17d276)
153+
org.glassfish.hk2:hk2-utils:3.0.6 (2 constraints: 21172277)
154154

155155
org.glassfish.hk2:osgi-resource-locator:1.0.3 (1 constraints: ef10e7c2)
156156

157-
org.glassfish.hk2.external:aopalliance-repackaged:3.0.4 (2 constraints: 1d17d276)
157+
org.glassfish.hk2.external:aopalliance-repackaged:3.0.6 (2 constraints: 21172277)
158158

159-
org.glassfish.jersey.core:jersey-client:3.1.3 (1 constraints: 0011bfc3)
159+
org.glassfish.jersey.core:jersey-client:3.1.11 (1 constraints: 2f11ecd4)
160160

161-
org.glassfish.jersey.core:jersey-common:3.1.3 (7 constraints: aa7a1d48)
161+
org.glassfish.jersey.core:jersey-common:3.1.11 (7 constraints: f37b28e6)
162162

163-
org.glassfish.jersey.core:jersey-server:3.1.3 (4 constraints: 31452caa)
163+
org.glassfish.jersey.core:jersey-server:3.1.11 (4 constraints: be45b251)
164164

165-
org.glassfish.jersey.ext:jersey-bean-validation:3.1.3 (1 constraints: 09050036)
165+
org.glassfish.jersey.ext:jersey-bean-validation:3.1.11 (1 constraints: 3805363b)
166166

167-
org.glassfish.jersey.inject:jersey-hk2:3.1.3 (1 constraints: 09050036)
167+
org.glassfish.jersey.inject:jersey-hk2:3.1.11 (1 constraints: 3805363b)
168168

169169
org.hdrhistogram:HdrHistogram:2.2.2 (1 constraints: 0e100092)
170170

171-
org.hibernate.validator:hibernate-validator:8.0.1.Final (1 constraints: 1916ffe3)
171+
org.hibernate.validator:hibernate-validator:8.0.2.Final (1 constraints: 1a1606e4)
172172

173173
org.immutables:value:2.11.7 (2 constraints: 0615a6c2)
174174

175-
org.javassist:javassist:3.29.2-GA (1 constraints: 30112ef1)
175+
org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0)
176176

177-
org.jboss.logging:jboss-logging:3.5.0.Final (4 constraints: 0747c0c6)
177+
org.jboss.logging:jboss-logging:3.6.1.Final (4 constraints: 09479ac7)
178178

179179
org.jboss.threads:jboss-threads:3.5.1.Final (3 constraints: ba2a18e6)
180180

@@ -238,11 +238,11 @@ org.assertj:assertj-core:3.27.6 (2 constraints: a719cee0)
238238

239239
org.conscrypt:conscrypt-openjdk-uber:2.5.2 (1 constraints: 0b050636)
240240

241-
org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.3 (1 constraints: 09050036)
241+
org.glassfish.jersey.containers:jersey-container-servlet-core:3.1.11 (1 constraints: 3805363b)
242242

243-
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.3 (1 constraints: bd1525d3)
243+
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.11 (1 constraints: ec150fe9)
244244

245-
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.3 (1 constraints: 09050036)
245+
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.11 (1 constraints: 3805363b)
246246

247247
org.hamcrest:hamcrest:2.2 (2 constraints: 8712ab2d)
248248

versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ org.apache.httpcomponents.client5:* = 5.5.1
4949
jakarta.servlet:jakarta.servlet-api = 5.0.0
5050
jakarta.ws.rs:jakarta.ws.rs-api = 3.1.0
5151
jakarta.annotation:jakarta.annotation-api = 2.0.0
52-
org.glassfish.jersey.*:* = 3.1.3
52+
org.glassfish.jersey.*:* = 3.1.11
5353

5454
# for version locks on legacy javax versions
5555
javax.annotation:javax.annotation-api = 1.3.2

0 commit comments

Comments
 (0)