Skip to content

Commit 64c3d6d

Browse files
authored
Fix: Move from javax to jakarta api jars (#564)
Switch javax dependencies to equivalent jakarta dependencies
1 parent 7d474b5 commit 64c3d6d

File tree

6 files changed

+14
-7
lines changed

6 files changed

+14
-7
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
type: fix
2+
fix:
3+
description: Switch javax dependencies to equivalent jakarta dependencies
4+
links:
5+
- https://github.com/palantir/tracing-java/pull/564

tracing-jaxrs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply plugin: 'com.palantir.revapi'
2121

2222
dependencies {
2323
compile project(":tracing")
24-
compile "javax.ws.rs:javax.ws.rs-api"
24+
compile "jakarta.ws.rs:jakarta.ws.rs-api"
2525

2626
testImplementation "ch.qos.logback:logback-classic"
2727
testImplementation "junit:junit"

tracing-jersey/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
compile project(":tracing")
2323

2424
implementation 'com.google.guava:guava'
25-
implementation 'javax.ws.rs:javax.ws.rs-api'
25+
implementation 'jakarta.ws.rs:jakarta.ws.rs-api'
2626
implementation project(':tracing-api')
2727

2828
testImplementation "io.dropwizard:dropwizard-testing"

tracing-servlet/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies {
2222
implementation project(":tracing")
2323

2424
// servlet-api should be the only exposed dependency
25-
api "javax.servlet:javax.servlet-api"
25+
api "jakarta.servlet:jakarta.servlet-api"
2626

2727
implementation "org.slf4j:slf4j-api"
2828

versions.lock

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ com.palantir.safe-logging:safe-logging:1.8.2 (3 constraints: 422aeb21)
1616
com.squareup.okhttp3:okhttp:3.9.0 (1 constraints: 0e051536)
1717
com.squareup.okio:okio:1.13.0 (1 constraints: 7f0cb509)
1818
io.undertow:undertow-core:2.0.17.Final (1 constraints: 54072861)
19+
jakarta.servlet:jakarta.servlet-api:4.0.4 (1 constraints: 0a050336)
20+
jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (1 constraints: 0b05fe35)
1921
javax.annotation:javax.annotation-api:1.2 (2 constraints: 2d21193d)
2022
javax.inject:javax.inject:1 (2 constraints: d614a0ab)
21-
javax.servlet:javax.servlet-api:3.1.0 (2 constraints: 88129b22)
2223
javax.validation:validation-api:1.1.0.Final (3 constraints: dc393f20)
23-
javax.ws.rs:javax.ws.rs-api:2.0.1 (8 constraints: ed9109e8)
24+
javax.ws.rs:javax.ws.rs-api:2.0.1 (7 constraints: e98c8a03)
2425
net.sf.jopt-simple:jopt-simple:4.6 (1 constraints: 610a91b7)
2526
org.apache.commons:commons-math3:3.2 (1 constraints: 5c0a8ab7)
2627
org.checkerframework:checker-qual:2.8.1 (1 constraints: 1d0afeb4)
@@ -87,6 +88,7 @@ io.dropwizard.metrics:metrics-jvm:4.0.2 (2 constraints: 241e5546)
8788
io.dropwizard.metrics:metrics-logback:4.0.2 (1 constraints: 7e0edc4f)
8889
io.dropwizard.metrics:metrics-servlets:4.0.2 (1 constraints: 400d371f)
8990
io.zipkin.java:zipkin:1.13.1 (1 constraints: 3805333b)
91+
javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 830dcc28)
9092
joda-time:joda-time:2.9.9 (3 constraints: e12d801f)
9193
junit:junit:4.13 (5 constraints: b760c877)
9294
net.bytebuddy:byte-buddy:1.10.5 (1 constraints: 410b37de)

versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ com.squareup.okhttp3:okhttp = 3.9.0
99
io.dropwizard:dropwizard-* = 1.3.1
1010
io.undertow:undertow-core = 2.0.17.Final
1111
io.zipkin.java:* = 1.13.1
12-
javax.servlet:javax.servlet-api = 3.1.0
13-
javax.ws.rs:javax.ws.rs-api = 2.0.1
12+
jakarta.servlet:jakarta.servlet-api = 4.0.4
13+
jakarta.ws.rs:jakarta.ws.rs-api = 2.1.6
1414
org.glassfish.jersey.*:* = 2.22.2
1515
org.slf4j:slf4j-api = 1.7.12
1616
com.palantir.conjure.java.runtime:* = 4.19.0

0 commit comments

Comments
 (0)