Merge branch '3.6-dev' into 3.7-dev

apache · Dec 12, 2023 · 679b784 · 679b784
2 parents a5784e7 + b48fd8c
commit 679b784
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -281,6 +281,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 * Improved error message from `JavaTranslator` by including exception source.
 * Added tests for error handling for GLV's if tx.commit() is called remotely for graphs without transactions support.
+* Introduced multi-architecture AMD64/ARM64 docker images for gremlin-console.
 
 [[release-3-6-6]]
 === TinkerPop 3.6.6 (November 20, 2023)

diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
@@ -26,12 +26,7 @@ limitations under the License.
     <artifactId>gremlin-console</artifactId>
     <name>Apache TinkerPop :: Gremlin Console</name>
     <properties>
-    <!--Testing in macOs on ARM reveals that the linux/arm64/v8 console
-        container is quite unstable at this time and results in frequent freezes.
-        It is believed the issue lies with the ARM docker engine. The stability of ARM
-        images is likely to improve overtime and this omition should be intermittently
-        re-evaluated.-->
-        <docker.platforms>linux/amd64<!--,linux/arm64/v8--></docker.platforms>
+        <docker.platforms>linux/amd64,linux/arm64/v8</docker.platforms>
     </properties>
     <dependencies>
         <dependency>