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.

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

Replace external javax depedencies with jakarta equivalents #1836

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

Conversation

connorworley
Copy link
Contributor

Fixes the internal OSS-as-a-submodule workflow.

@@ -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.

@@ -2,7 +2,7 @@ apply plugin: "java-library"

dependencies {
implementation project(":zuul-core")
api(group: 'com.google.inject', name: 'guice', version: "5.1.0")
api(group: 'com.google.inject', name: 'guice', version: "6.0.0")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

6.0.0 supports both javax.inject and jakarta.inject.

@@ -14,7 +14,6 @@ dependencies {
annotationProcessor project(":zuul-processor")

testImplementation 'org.wiremock:wiremock:3.9.1'
testImplementation 'javax.servlet:javax.servlet-api:4.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.

This seemed to be unused.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant