[grid] Adding native ARM support for sockets

SeleniumHQ · Jun 16, 2022 · 5713de4 · 5713de4
1 parent 4fbd4a2
commit 5713de4
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/java/maven_deps.bzl b/java/maven_deps.bzl
@@ -42,6 +42,7 @@ def selenium_java_deps():
             "io.netty:netty-transport-native-epoll:%s" % netty_version,
             "io.netty:netty-transport-native-epoll:jar:linux-x86_64:%s" % netty_version,
             "io.netty:netty-transport-native-kqueue:%s" % netty_version,
+            "io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:%s" % netty_version,
             "io.netty:netty-transport-native-kqueue:jar:osx-x86_64:%s" % netty_version,
             # End - Needed to support unix domain sockets
             "io.netty:netty-transport-native-unix-common:%s" % netty_version,

diff --git a/java/maven_install.json b/java/maven_install.json
@@ -1,8 +1,8 @@
 {
     "dependency_tree": {
         "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-        "__INPUT_ARTIFACTS_HASH": -969271736,
-        "__RESOLVED_ARTIFACTS_HASH": 630789511,
+        "__INPUT_ARTIFACTS_HASH": -1341687044,
+        "__RESOLVED_ARTIFACTS_HASH": -1988842798,
         "conflict_resolution": {},
         "dependencies": [
             {
@@ -2191,6 +2191,36 @@
                 "sha256": "ce87b3400ce5a869494007b67c1f2a4af4fe90c48e6ce7dd441cff01f5fa4015",
                 "url": "https://repo1.maven.org/maven2/io/netty/netty-transport-native-epoll/4.1.77.Final/netty-transport-native-epoll-4.1.77.Final.jar"
             },
+            {
+                "coord": "io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.77.Final",
+                "dependencies": [
+                    "io.netty:netty-buffer:4.1.77.Final",
+                    "io.netty:netty-common:4.1.77.Final",
+                    "io.netty:netty-resolver:4.1.77.Final",
+                    "io.netty:netty-transport-classes-kqueue:4.1.77.Final",
+                    "io.netty:netty-transport-native-unix-common:4.1.77.Final",
+                    "io.netty:netty-transport:4.1.77.Final"
+                ],
+                "directDependencies": [
+                    "io.netty:netty-buffer:4.1.77.Final",
+                    "io.netty:netty-common:4.1.77.Final",
+                    "io.netty:netty-transport-classes-kqueue:4.1.77.Final",
+                    "io.netty:netty-transport-native-unix-common:4.1.77.Final",
+                    "io.netty:netty-transport:4.1.77.Final"
+                ],
+                "exclusions": [
+                    "org.hamcrest:hamcrest-all",
+                    "org.hamcrest:hamcrest-core",
+                    "io.netty:netty-all"
+                ],
+                "file": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport-native-kqueue/4.1.77.Final/netty-transport-native-kqueue-4.1.77.Final-osx-aarch_64.jar",
+                "mirror_urls": [
+                    "https://repo1.maven.org/maven2/io/netty/netty-transport-native-kqueue/4.1.77.Final/netty-transport-native-kqueue-4.1.77.Final-osx-aarch_64.jar",
+                    "https://maven.google.com/io/netty/netty-transport-native-kqueue/4.1.77.Final/netty-transport-native-kqueue-4.1.77.Final-osx-aarch_64.jar"
+                ],
+                "sha256": "ba6993deb77d5420b61f653003019c41898a70e86da472c4a1586c4740fbedc1",
+                "url": "https://repo1.maven.org/maven2/io/netty/netty-transport-native-kqueue/4.1.77.Final/netty-transport-native-kqueue-4.1.77.Final-osx-aarch_64.jar"
+            },
             {
                 "coord": "io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.77.Final",
                 "dependencies": [

diff --git a/java/src/org/openqa/selenium/remote/http/netty/BUILD.bazel b/java/src/org/openqa/selenium/remote/http/netty/BUILD.bazel
@@ -23,6 +23,7 @@ java_library(
         artifact("io.netty:netty-transport-native-epoll"),
         artifact("io.netty:netty-transport-native-epoll-linux-x86_64"),
         artifact("io.netty:netty-transport-native-kqueue"),
+        artifact("io.netty:netty-transport-native-kqueue-osx-aarch_64"),
         artifact("io.netty:netty-transport-native-kqueue-osx-x86_64"),
         artifact("io.netty:netty-transport-native-unix-common"),
         artifact("io.netty:netty-common"),