You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by va...@apache.org on 2022/10/07 19:10:52 UTC
[tinkerpop] branch 3.6-dev updated (5144df6d3b -> 73531f9c16)
This is an automated email from the ASF dual-hosted git repository.
valentyn pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 5144df6d3b Merge branch '3.5-dev' into 3.6-dev
add 4453649d68 Cole/m1 support (#38)
add dd3ea707a1 TINKERPOP-2808 Compatibility fixes for ARM based Macs #1821
new 73531f9c16 Merge branch '3.5-dev' into 3.6-dev
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/src/dev/developer/development-environment.asciidoc | 4 ++++
gremlin-console/Dockerfile | 6 ++++--
gremlin-console/pom.xml | 5 +++++
gremlin-server/Dockerfile | 5 +++--
4 files changed, 16 insertions(+), 4 deletions(-)
[tinkerpop] 01/01: Merge branch '3.5-dev' into 3.6-dev
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
valentyn pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 73531f9c16f99eaa7294fbd2bbddfc52a3414765
Merge: 5144df6d3b dd3ea707a1
Author: Valentyn Kahamlyk <va...@bitquilltech.com>
AuthorDate: Fri Oct 7 12:10:20 2022 -0700
Merge branch '3.5-dev' into 3.6-dev
docs/src/dev/developer/development-environment.asciidoc | 4 ++++
gremlin-console/Dockerfile | 6 ++++--
gremlin-console/pom.xml | 5 +++++
gremlin-server/Dockerfile | 5 +++--
4 files changed, 16 insertions(+), 4 deletions(-)
diff --cc docs/src/dev/developer/development-environment.asciidoc
index 204fe20a7c,75e2956d6c..74e1e04a5e
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@@ -627,10 -565,14 +627,14 @@@ inside of `tinkerpop` (platform-agnosti
* Run `GREMLIN_SERVER=<server-image-version> docker-compose up --exit-code-from gremlin-go-integration-tests` in Unix/Linux.
* Run `$env:GREMLIN_SERVER="<server-image-version>";$env:HOME=$env:USERPROFILE;docker-compose up --exit-code-from gremlin-go-integration-tests` in Windows PowerShell.
-You should see exit code 0 upon successful completion of the test suites. Run `docker-compose down` to remove the
-service containers (not needed if you executed Maven commands or `run.sh`), or `docker-compose down --rmi all` to
+You should see exit code 0 upon successful completion of the test suites. Run `docker-compose down` to remove the
+service containers (not needed if you executed Maven commands or `run.sh`), or `docker-compose down --rmi all` to
remove the service containers while deleting all used images.
+ Note for running docker with MacOS on ARM processors: Docker's performance is extremely poor on ARM Mac's in its
+ default configuration. It is recommended to enable both the "New Virtualization Framework" and "VirtioFS" under
+ Docker Desktop Settings -> Experimental Features.
+
[[intellij]]
== Intellij Usage
diff --cc gremlin-console/pom.xml
index 62ed1ec91d,aa553eab07..1f0cf7d129
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@@ -51,10 -51,20 +51,15 @@@ limitations under the License
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>1.17.1</version>
+ </dependency>
<!-- TESTING -->
<dependency>
<groupId>junit</groupId>