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

Add netty-incubator-transport-native-io_uring to servicetalk-dependencies #2295

Merged
merged 3 commits into from
Jul 29, 2022
Merged

Add netty-incubator-transport-native-io_uring to servicetalk-dependencies #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
031e43a
Add netty-incubator-transport-native-io_uring to servicetalk-dependen…
Scottmitch Jul 28, 2022
8d9db48
fix build
Scottmitch Jul 29, 2022
a1f0802
checkstyle
Scottmitch Jul 29, 2022
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
6 changes: 6 additions & 0 deletions servicetalk-dependencies/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ dependencies {
api "com.google.code.findbugs:jsr305:$jsr305Version"
api "com.sun.activation:jakarta.activation:$javaxActivationVersion"
api "com.sun.xml.bind:jaxb-core:$javaxJaxbCoreVersion"

// Ideally these come from the Netty BOM
api "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
api "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion:linux-x86_64"
api "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion:linux-aarch_64"

api "io.opentracing:opentracing-api:$openTracingVersion"
api "io.zipkin.reporter2:zipkin-reporter:$zipkinReporterVersion"
api "jakarta.ws.rs:jakarta.ws.rs-api:$jaxRsVersion"
Expand Down
6 changes: 3 additions & 3 deletions servicetalk-http-netty/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ dependencies {
testImplementation project(":servicetalk-utils-internal")
testImplementation project(":servicetalk-oio-api-internal")
testImplementation "io.netty:netty-transport-native-unix-common"
testImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
testImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion:linux-x86_64"
testImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion:linux-aarch_64"
testImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring"
testRuntimeOnly( group:"io.netty.incubator", name:"netty-incubator-transport-native-io_uring", classifier:"linux-x86_64")
testRuntimeOnly( group:"io.netty.incubator", name:"netty-incubator-transport-native-io_uring", classifier:"linux-aarch_64")
testImplementation "org.junit.jupiter:junit-jupiter-api"
testImplementation "org.junit.jupiter:junit-jupiter-params"
testImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
Expand Down
1 change: 1 addition & 0 deletions servicetalk-http-netty/gradle/checkstyle/suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@
<suppressions>
<suppress checks="FallThrough" files="io[\\/]servicetalk[\\/]http[\\/]netty[\\/]HttpObjectDecoder.java"/>
<suppress checks="FallThrough" files="io[\\/]servicetalk[\\/]http[\\/]netty[\\/]HttpObjectEncoder.java"/>
<suppress checks="LineLength" files="build.gradle"/>
</suppressions>
8 changes: 4 additions & 4 deletions servicetalk-transport-netty-internal/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ dependencies {
implementation "io.netty:netty-transport-native-kqueue"
runtimeOnly( group:"io.netty", name:"netty-transport-native-kqueue", classifier:"osx-x86_64")
runtimeOnly( group:"io.netty", name:"netty-transport-native-kqueue", classifier:"osx-aarch_64")
implementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
runtimeOnly "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion:linux-x86_64"
runtimeOnly "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion:linux-aarch_64"
implementation "io.netty.incubator:netty-incubator-transport-native-io_uring"
runtimeOnly( group:"io.netty.incubator", name:"netty-incubator-transport-native-io_uring", classifier:"linux-x86_64")
runtimeOnly( group:"io.netty.incubator", name:"netty-incubator-transport-native-io_uring", classifier:"linux-aarch_64")
runtimeOnly( group:"io.netty", name:"netty-tcnative-boringssl-static", classifier:"linux-x86_64")
runtimeOnly( group:"io.netty", name:"netty-tcnative-boringssl-static", classifier:"linux-aarch_64")
runtimeOnly( group:"io.netty", name:"netty-tcnative-boringssl-static", classifier:"osx-x86_64")
Expand All @@ -61,7 +61,7 @@ dependencies {
testImplementation "org.mockito:mockito-junit-jupiter:$mockitoCoreVersion"

testFixturesImplementation project(":servicetalk-utils-internal")
testFixturesImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring:$nettyIoUringVersion"
testFixturesImplementation "io.netty.incubator:netty-incubator-transport-native-io_uring"
testFixturesImplementation "com.google.code.findbugs:jsr305"
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api"
testFixturesImplementation "org.hamcrest:hamcrest:$hamcrestVersion"
Expand Down
1 change: 1 addition & 0 deletions servicetalk-transport-netty-internal/gradle/checkstyle/suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@
<!-- The list of test cases must be kept single-line each. -->
<suppress checks="LineLength"
files="io[\\/]servicetalk[\\/]transport[\\/]netty[\\/]internal[\\/]RequestResponseCloseHandlerTest.java"/>
<suppress checks="LineLength" files="build.gradle"/>
</suppressions>