Skip to content

Commit 692a922

Browse files
Switch all archs to netty-tcnative-boringssl-static
patch by Mick Semb Wever; reviewed by Siyao He for CASSANDRA-18971
1 parent a7553cc commit 692a922

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

driver-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127

128128
<dependency>
129129
<groupId>io.netty</groupId>
130-
<artifactId>${netty-tcnative.artifact}</artifactId>
130+
<artifactId>netty-tcnative-boringssl-static</artifactId>
131131
<classifier>${os.detected.classifier}</classifier>
132132
<scope>test</scope>
133133
</dependency>

pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<slf4j-log4j12.version>1.7.25</slf4j-log4j12.version>
5959
<guava.version>19.0</guava.version>
6060
<netty.version>4.1.94.Final</netty.version>
61-
<netty-tcnative.artifact>netty-tcnative</netty-tcnative.artifact>
6261
<netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
6362
<metrics.version>3.2.2</metrics.version>
6463
<snappy.version>1.1.2.6</snappy.version>
@@ -357,7 +356,7 @@
357356

358357
<dependency>
359358
<groupId>io.netty</groupId>
360-
<artifactId>${netty-tcnative.artifact}</artifactId>
359+
<artifactId>netty-tcnative-boringssl-static</artifactId>
361360
<version>${netty-tcnative.version}</version>
362361
<classifier>${os.detected.classifier}</classifier>
363362
</dependency>
@@ -1169,8 +1168,6 @@ limitations under the License.
11691168
</os>
11701169
</activation>
11711170
<properties>
1172-
<!-- https://netty.io/wiki/forked-tomcat-native.html netty on apple-silicon requires the boringssl variant of tc-native -->
1173-
<netty-tcnative.artifact>netty-tcnative-boringssl-static</netty-tcnative.artifact>
11741171
<!-- https://github.com/jnr/jffi/pull/116 apple-silicon requires signed jffi binaries, added in 1.3.8 (jnr-ffi 2.2.10+) -->
11751172
<jnr-ffi.version>2.2.10</jnr-ffi.version>
11761173
<snappy.version>1.1.10.1</snappy.version>

0 commit comments

Comments
 (0)