This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 58f5301e78 ninja-fix stick affinity, and exclude it everywhere where
it would pull in the imported boms
58f5301e78 is described below
commit 58f5301e78d7f7adbbe4b3c6d0528b1bcb4c27bc
Author: Mick Semb Wever <[email protected]>
AuthorDate: Mon Mar 27 17:26:14 2023 +0200
ninja-fix stick affinity, and exclude it everywhere where it would pull in
the imported boms
patch by Mick Semb Wever; tested by David Capwell for CASSANDRA-18049
---
.build/cassandra-deps-template.xml | 8 ++++++--
.build/parent-pom-template.xml | 29 ++++++++++++++++++++++++++++-
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/.build/cassandra-deps-template.xml
b/.build/cassandra-deps-template.xml
index 69a184a832..1920d03539 100644
--- a/.build/cassandra-deps-template.xml
+++ b/.build/cassandra-deps-template.xml
@@ -232,11 +232,15 @@
<classifier>native</classifier>
</dependency>
<dependency>
- <!-- transitive to jnr-ffi to chronicle-core -->
+ <!-- transitive to jnr-ffi to chronicle-core -->
<groupId>com.github.jnr</groupId>
<artifactId>jnr-constants</artifactId>
</dependency>
-
+ <dependency>
+ <!-- transitive to chronicle-threads -->
+ <groupId>net.openhft</groupId>
+ <artifactId>affinity</artifactId>
+ </dependency>
<!-- end of chronicle-queue -->
<dependency>
diff --git a/.build/parent-pom-template.xml b/.build/parent-pom-template.xml
index 35ed4047fb..ba48cbd542 100644
--- a/.build/parent-pom-template.xml
+++ b/.build/parent-pom-template.xml
@@ -687,6 +687,8 @@
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>2.0.36.Final</version>
</dependency>
+
+ <!-- chronicle-queue deps -->
<dependency>
<groupId>net.openhft</groupId>
<artifactId>chronicle-queue</artifactId>
@@ -696,6 +698,11 @@
<artifactId>tools</artifactId>
<groupId>com.sun</groupId>
</exclusion>
+ <exclusion>
+ <!-- pulls in affinity-3.23ea1 which pulls in
third-party-bom-3.22.4-SNAPSHOT -->
+ <groupId>net.openhft</groupId>
+ <artifactId>affinity</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -733,19 +740,39 @@
<artifactId>compiler</artifactId>
<groupId>net.openhft</groupId>
</exclusion>
+ <exclusion>
+ <!-- pulls in affinity-3.23ea1 which pulls in
third-party-bom-3.22.4-SNAPSHOT -->
+ <groupId>net.openhft</groupId>
+ <artifactId>affinity</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.openhft</groupId>
<artifactId>chronicle-threads</artifactId>
<version>2.23.25</version>
+ <exclusions>
+ <exclusion>
+ <!-- pulls in affinity-3.23ea1 which pulls in
third-party-bom-3.22.4-SNAPSHOT -->
+ <groupId>net.openhft</groupId>
+ <artifactId>affinity</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <!-- transitive to chronicle-queue -->
+ <!-- transitive to chronicle-queue, declared explicit to use newer
version -->
+ <groupId>net.openhft</groupId>
+ <artifactId>affinity</artifactId>
+ <version>3.23.3</version>
+ </dependency>
+ <dependency>
+ <!-- transitive to chronicle-queue, declared explicit to use newer
version -->
<groupId>net.openhft</groupId>
<artifactId>posix</artifactId>
<version>2.24ea4</version>
</dependency>
+ <!-- end of chronicle-queue -->
+
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
