This is an automated email from the ASF dual-hosted git repository.
xvrl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 752e42a312 fix running integration tests on macos aarch64 (#12913)
752e42a312 is described below
commit 752e42a312e98f83c3a89af3648065b4b909fe59
Author: Xavier Léauté <[email protected]>
AuthorDate: Wed Aug 17 18:03:24 2022 +0200
fix running integration tests on macos aarch64 (#12913)
* add osx-aarch_64 netty-transport-native-kqueue native dependency
* align docker-java dependency versions using bom and update to 3.2.13
---
integration-tests/pom.xml | 14 ++++++--------
pom.xml | 7 +++++++
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 11fdfec414..feba80be28 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -310,32 +310,24 @@
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
- <version>3.2.0</version>
<exclusions>
<exclusion>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-jersey</artifactId>
</exclusion>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-netty</artifactId>
- <version>3.2.11</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-api</artifactId>
- <version>3.2.0</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-core</artifactId>
- <version>3.2.0</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -343,6 +335,12 @@
<classifier>osx-x86_64</classifier>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport-native-kqueue</artifactId>
+ <classifier>osx-aarch_64</classifier>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
diff --git a/pom.xml b/pom.xml
index ae0711d839..ef0b1a5b66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -947,6 +947,13 @@
<scope>import</scope>
<type>pom</type>
</dependency>
+ <dependency>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-bom</artifactId>
+ <version>3.2.13</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
