Skip to content

Commit

Permalink
Switch all archs to netty-tcnative-boringssl-static
Browse files Browse the repository at this point in the history
 patch by Mick Semb Wever; reviewed by Siyao He for CASSANDRA-18971
  • Loading branch information
michaelsembwever committed Sep 26, 2024
1 parent a7553cc commit 692a922
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion driver-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 1 addition & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 692a922

Please sign in to comment.