From a3594c883f390672ed8aba614eaccad1fe27d0ff Mon Sep 17 00:00:00 2001 From: Robin Han Date: Thu, 30 Nov 2023 10:49:41 +0800 Subject: [PATCH 1/2] feat: add boring ssl Signed-off-by: Robin Han --- build.gradle | 1 + gradle/dependencies.gradle | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 73fda3f69a..6ccf5e85a5 100644 --- a/build.gradle +++ b/build.gradle @@ -957,6 +957,7 @@ project(':core') { exclude group: 'org.slf4j', module: '*' exclude group: 'net.sourceforge.argparse4j', module: '*' } + implementation libs.boringssl testImplementation project(':clients').sourceSets.test.output diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index bf3ee49bce..8fc6f5ae63 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -128,7 +128,8 @@ versions += [ zookeeper: "3.6.3", zstd: "1.5.2-1", commonLang: "3.12.0", - s3stream: "0.6.4-SNAPSHOT", + s3stream: "0.6.5-SNAPSHOT", + boringssl: "2.0.62.Final", ] libs += [ activation: "javax.activation:activation:$versions.activation", @@ -223,4 +224,5 @@ libs += [ commonLang: "org.apache.commons:commons-lang3:$versions.commonLang", nettyHttp2: "io.netty:netty-codec-http2:$versions.netty", s3stream: "com.automq.elasticstream:s3stream:$versions.s3stream", + boringssl: "io.netty:netty-tcnative-boringssl-static:$versions.boringssl", ] From f9c1fdb71dedfa53c35a2d5031f0f3e1f2313db5 Mon Sep 17 00:00:00 2001 From: Robin Han Date: Thu, 30 Nov 2023 11:41:41 +0800 Subject: [PATCH 2/2] feat(s3stream): add boringssl dependence Signed-off-by: Robin Han --- build.gradle | 5 +++-- gradle/dependencies.gradle | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 6ccf5e85a5..b54a9cf246 100644 --- a/build.gradle +++ b/build.gradle @@ -957,8 +957,9 @@ project(':core') { exclude group: 'org.slf4j', module: '*' exclude group: 'net.sourceforge.argparse4j', module: '*' } - implementation libs.boringssl - + // https://github.com/netty/netty-tcnative/issues/716 + // After 2.0.48, gradle project need explicitly declare the tcnative dependencies with classifiers + implementation 'io.netty:netty-tcnative-boringssl-static:2.0.48.Final' testImplementation project(':clients').sourceSets.test.output testImplementation project(':group-coordinator').sourceSets.test.output diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 8fc6f5ae63..bda20cb329 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -129,7 +129,6 @@ versions += [ zstd: "1.5.2-1", commonLang: "3.12.0", s3stream: "0.6.5-SNAPSHOT", - boringssl: "2.0.62.Final", ] libs += [ activation: "javax.activation:activation:$versions.activation", @@ -224,5 +223,4 @@ libs += [ commonLang: "org.apache.commons:commons-lang3:$versions.commonLang", nettyHttp2: "io.netty:netty-codec-http2:$versions.netty", s3stream: "com.automq.elasticstream:s3stream:$versions.s3stream", - boringssl: "io.netty:netty-tcnative-boringssl-static:$versions.boringssl", ]