Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace external javax depedencies with jakarta equivalents #1836

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace external javax depedencies with jakarta equivalents #1836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zuul-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies {
runtimeOnly( group: "io.netty", name: "netty-tcnative-boringssl-static", classifier: "osx-aarch_64" )

implementation 'io.perfmark:perfmark-api:0.26.0'
implementation 'javax.inject:javax.inject:1'
api 'jakarta.inject:jakarta.inject-api:2.0.1'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to api is necessary to get jakarta.inject-api into internal zuul's classpath.


testImplementation libraries.jupiterApi, libraries.jupiterParams, libraries.jupiterEngine, libraries.jupiterMockito,
libraries.mockito,
Expand Down
90 changes: 54 additions & 36 deletions zuul-core/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
]
},
"com.netflix.spectator:spectator-api": {
"locked": "1.7.19"
"locked": "1.8.1"
},
"com.netflix.zuul:zuul-discovery": {
"project": true
Expand Down Expand Up @@ -353,6 +353,9 @@
"io.reactivex:rxjava": {
"locked": "1.3.8"
},
"jakarta.inject:jakarta.inject-api": {
"locked": "2.0.1"
},
"javax.inject:javax.inject": {
"locked": "1",
"transitive": [
Expand Down Expand Up @@ -599,7 +602,7 @@
]
},
"com.netflix.spectator:spectator-api": {
"locked": "1.7.19"
"locked": "1.8.1"
},
"com.netflix.zuul:zuul-discovery": {
"project": true
Expand Down Expand Up @@ -817,6 +820,9 @@
"io.reactivex:rxjava": {
"locked": "1.3.8"
},
"jakarta.inject:jakarta.inject-api": {
"locked": "2.0.1"
},
"javax.inject:javax.inject": {
"locked": "1",
"transitive": [
Expand Down Expand Up @@ -1133,7 +1139,7 @@
]
},
"com.netflix.spectator:spectator-api": {
"locked": "1.7.19"
"locked": "1.8.1"
},
"com.netflix.zuul:zuul-discovery": {
"project": true
Expand Down Expand Up @@ -1376,6 +1382,9 @@
"com.netflix.ribbon:ribbon-loadbalancer"
]
},
"jakarta.inject:jakarta.inject-api": {
"locked": "2.0.1"
},
"javax.inject:javax.inject": {
"locked": "1",
"transitive": [
Expand Down Expand Up @@ -1409,13 +1418,13 @@
]
},
"net.bytebuddy:byte-buddy": {
"locked": "1.15.0",
"locked": "1.15.4",
"transitive": [
"org.mockito:mockito-core"
]
},
"net.bytebuddy:byte-buddy-agent": {
"locked": "1.15.0",
"locked": "1.15.4",
"transitive": [
"org.mockito:mockito-core"
]
Expand Down Expand Up @@ -1508,7 +1517,7 @@
]
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-engine",
"org.junit.jupiter:junit-jupiter-params",
Expand All @@ -1517,34 +1526,34 @@
]
},
"org.junit.jupiter:junit-jupiter-engine": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-params": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-commons": {
"locked": "1.11.0",
"locked": "1.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit.platform:junit-platform-engine",
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-engine": {
"locked": "1.11.0",
"locked": "1.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-engine",
"org.junit:junit-bom"
]
},
"org.junit:junit-bom": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit.jupiter:junit-jupiter-engine",
Expand All @@ -1554,13 +1563,13 @@
]
},
"org.mockito:mockito-core": {
"locked": "5.13.0",
"locked": "5.14.2",
"transitive": [
"org.mockito:mockito-junit-jupiter"
]
},
"org.mockito:mockito-junit-jupiter": {
"locked": "5.13.0"
"locked": "5.14.2"
},
"org.objenesis:objenesis": {
"locked": "3.3",
Expand Down Expand Up @@ -1835,7 +1844,7 @@
]
},
"com.netflix.spectator:spectator-api": {
"locked": "1.7.19"
"locked": "1.8.1"
},
"com.netflix.zuul:zuul-discovery": {
"project": true
Expand Down Expand Up @@ -2078,6 +2087,9 @@
"com.netflix.ribbon:ribbon-loadbalancer"
]
},
"jakarta.inject:jakarta.inject-api": {
"locked": "2.0.1"
},
"javax.inject:javax.inject": {
"locked": "1",
"transitive": [
Expand Down Expand Up @@ -2334,7 +2346,7 @@
]
},
"com.netflix.spectator:spectator-api": {
"locked": "1.7.19"
"locked": "1.8.1"
},
"com.netflix.zuul:zuul-discovery": {
"project": true
Expand Down Expand Up @@ -2552,6 +2564,9 @@
"io.reactivex:rxjava": {
"locked": "1.3.8"
},
"jakarta.inject:jakarta.inject-api": {
"locked": "2.0.1"
},
"javax.inject:javax.inject": {
"locked": "1",
"transitive": [
Expand All @@ -2572,13 +2587,13 @@
]
},
"net.bytebuddy:byte-buddy": {
"locked": "1.15.0",
"locked": "1.15.4",
"transitive": [
"org.mockito:mockito-core"
]
},
"net.bytebuddy:byte-buddy-agent": {
"locked": "1.15.0",
"locked": "1.15.4",
"transitive": [
"org.mockito:mockito-core"
]
Expand Down Expand Up @@ -2645,42 +2660,42 @@
]
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-engine",
"org.junit.jupiter:junit-jupiter-params",
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-engine": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-params": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-commons": {
"locked": "1.11.0",
"locked": "1.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit.platform:junit-platform-engine",
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-engine": {
"locked": "1.11.0",
"locked": "1.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-engine",
"org.junit:junit-bom"
]
},
"org.junit:junit-bom": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit.jupiter:junit-jupiter-engine",
Expand All @@ -2690,13 +2705,13 @@
]
},
"org.mockito:mockito-core": {
"locked": "5.13.0",
"locked": "5.14.2",
"transitive": [
"org.mockito:mockito-junit-jupiter"
]
},
"org.mockito:mockito-junit-jupiter": {
"locked": "5.13.0"
"locked": "5.14.2"
},
"org.opentest4j:opentest4j": {
"locked": "1.3.0",
Expand Down Expand Up @@ -2933,7 +2948,7 @@
]
},
"com.netflix.spectator:spectator-api": {
"locked": "1.7.19"
"locked": "1.8.1"
},
"com.netflix.zuul:zuul-discovery": {
"project": true
Expand Down Expand Up @@ -3176,6 +3191,9 @@
"com.netflix.ribbon:ribbon-loadbalancer"
]
},
"jakarta.inject:jakarta.inject-api": {
"locked": "2.0.1"
},
"javax.inject:javax.inject": {
"locked": "1",
"transitive": [
Expand Down Expand Up @@ -3209,13 +3227,13 @@
]
},
"net.bytebuddy:byte-buddy": {
"locked": "1.15.0",
"locked": "1.15.4",
"transitive": [
"org.mockito:mockito-core"
]
},
"net.bytebuddy:byte-buddy-agent": {
"locked": "1.15.0",
"locked": "1.15.4",
"transitive": [
"org.mockito:mockito-core"
]
Expand Down Expand Up @@ -3296,7 +3314,7 @@
]
},
"org.junit.jupiter:junit-jupiter-api": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-engine",
"org.junit.jupiter:junit-jupiter-params",
Expand All @@ -3305,34 +3323,34 @@
]
},
"org.junit.jupiter:junit-jupiter-engine": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.jupiter:junit-jupiter-params": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-commons": {
"locked": "1.11.0",
"locked": "1.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit.platform:junit-platform-engine",
"org.junit:junit-bom"
]
},
"org.junit.platform:junit-platform-engine": {
"locked": "1.11.0",
"locked": "1.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-engine",
"org.junit:junit-bom"
]
},
"org.junit:junit-bom": {
"locked": "5.11.0",
"locked": "5.11.3",
"transitive": [
"org.junit.jupiter:junit-jupiter-api",
"org.junit.jupiter:junit-jupiter-engine",
Expand All @@ -3342,13 +3360,13 @@
]
},
"org.mockito:mockito-core": {
"locked": "5.13.0",
"locked": "5.14.2",
"transitive": [
"org.mockito:mockito-junit-jupiter"
]
},
"org.mockito:mockito-junit-jupiter": {
"locked": "5.13.0"
"locked": "5.14.2"
},
"org.objenesis:objenesis": {
"locked": "3.3",
Expand Down
2 changes: 1 addition & 1 deletion zuul-core/src/main/java/com/netflix/netty/common/Http2ConnectionCloseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.inject.Inject;
import jakarta.inject.Inject;
import java.util.concurrent.TimeUnit;

/**
Expand Down
4 changes: 2 additions & 2 deletions zuul-core/src/main/java/com/netflix/netty/common/metrics/EventLoopGroupMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import com.netflix.spectator.api.Registry;
import java.util.HashMap;
import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;

/**
* User: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/com/netflix/netty/common/metrics/HttpBodySizeRecordingChannelHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import io.netty.handler.codec.http.HttpContent;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.util.AttributeKey;
import javax.inject.Provider;
import jakarta.inject.Provider;

/**
* User: [email protected]
Expand Down
Loading
Loading