This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch 3.x in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
commit 692a92279210cdf11c08bb7f15b91191b6f3a0d7 Author: mck <[email protected]> AuthorDate: Wed Sep 11 21:37:59 2024 +0200 Switch all archs to netty-tcnative-boringssl-static patch by Mick Semb Wever; reviewed by Siyao He for CASSANDRA-18971 --- driver-core/pom.xml | 2 +- pom.xml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/driver-core/pom.xml b/driver-core/pom.xml index 5f5ea3470..c607c8f48 100644 --- a/driver-core/pom.xml +++ b/driver-core/pom.xml @@ -127,7 +127,7 @@ <dependency> <groupId>io.netty</groupId> - <artifactId>${netty-tcnative.artifact}</artifactId> + <artifactId>netty-tcnative-boringssl-static</artifactId> <classifier>${os.detected.classifier}</classifier> <scope>test</scope> </dependency> diff --git a/pom.xml b/pom.xml index 37e9d97e6..c967b64af 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,6 @@ <slf4j-log4j12.version>1.7.25</slf4j-log4j12.version> <guava.version>19.0</guava.version> <netty.version>4.1.94.Final</netty.version> - <netty-tcnative.artifact>netty-tcnative</netty-tcnative.artifact> <netty-tcnative.version>2.0.61.Final</netty-tcnative.version> <metrics.version>3.2.2</metrics.version> <snappy.version>1.1.2.6</snappy.version> @@ -357,7 +356,7 @@ <dependency> <groupId>io.netty</groupId> - <artifactId>${netty-tcnative.artifact}</artifactId> + <artifactId>netty-tcnative-boringssl-static</artifactId> <version>${netty-tcnative.version}</version> <classifier>${os.detected.classifier}</classifier> </dependency> @@ -1169,8 +1168,6 @@ limitations under the License. </os> </activation> <properties> - <!-- https://netty.io/wiki/forked-tomcat-native.html netty on apple-silicon requires the boringssl variant of tc-native --> - <netty-tcnative.artifact>netty-tcnative-boringssl-static</netty-tcnative.artifact> <!-- https://github.com/jnr/jffi/pull/116 apple-silicon requires signed jffi binaries, added in 1.3.8 (jnr-ffi 2.2.10+) --> <jnr-ffi.version>2.2.10</jnr-ffi.version> <snappy.version>1.1.10.1</snappy.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
