[tinkerpop] 01/01: Merge branch '3.5-dev' into 3.6-dev

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ba0b1c6852de940505f1619d10dccb65e2f12a45
Merge: 01b1a9f385 b8d91efb45
Author: Yang Xia <55...@users.noreply.github.com>
AuthorDate: Thu Feb 2 17:33:07 2023 -0800

    Merge branch '3.5-dev' into 3.6-dev

 .../dev/developer/development-environment.asciidoc |  3 ++
 docs/src/dev/developer/release.asciidoc            | 33 +++++++++++++++-------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --cc docs/src/dev/developer/development-environment.asciidoc
index 0e27632e89,0b029039a8..3694a38f36
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@@ -121,8 -121,11 +121,11 @@@ an issue when working with SNAPSHOT dep
  The documentation generation process is not Maven-based and uses shell scripts to process the project's asciidoc. The
  scripts should work on Mac and Linux.
  
+ TIP: We recommend performing documentation generation on Linux. For the scripts to work on Mac, you will need to
+ install GNU versions of the utility programs via `homebrew`, e.g.`grep`, `awk`, `sed`, `findutils`, and `diffutils`.
+ 
 -To generate documentation, it is required that link:https://hadoop.apache.org[Hadoop 2.7.x] is running in
 -link:https://hadoop.apache.org/docs/r2.7.7/hadoop-project-dist/hadoop-common/SingleCluster.html#Pseudo-Distributed_Operation[pseudo-distributed]
 +To generate documentation, it is required that link:https://hadoop.apache.org[Hadoop 3.3.x] is running in
 +link:https://hadoop.apache.org/docs/r3.3.1/hadoop-project-dist/hadoop-common/SingleCluster.html#Pseudo-Distributed_Operation[pseudo-distributed]
  mode. Be sure to set the `HADOOP_GREMLIN_LIBS` environment variable as described in the
  link:https://tinkerpop.apache.org/docs/x.y.z/reference/#hadoop-gremlin[reference documentation]. It is also important
  to set the `CLASSPATH` to point at the directory containing the Hadoop configuration files, like `mapred-site.xml`.
diff --cc docs/src/dev/developer/release.asciidoc
index cfbb6baaad,eae99b699b..1d7d88c053
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@@ -248,11 -250,10 +257,12 @@@ the help of a PMC member for those step
  .. `mvn deploy -pl gremlin-python -DskipTests -Dpypi`
  .. `mvn deploy -pl :gremlin-dotnet-source -DskipTests -Dnuget`
  .. `mvn deploy -pl gremlin-javascript -DskipTests -Dnpm`
 +... Consider direct deploy with `npm publish --otp <otp>` from `gremlin-javscript/src/main/javascript/gremlin-javascript/` - if using this method, ensure the `npm` version aligns with the one expected by the branch.
  .. `mvn deploy -pl gremlint -DskipTests -Dnpm`
 -.. `git tag gremlin-go/v3.5.6`
 -.. `git push origin gremlin-go/v3.5.6`
 -.. `GOPROXY=proxy.golang.org go list -m github.com/apache/tinkerpop/gremlin-go/v3@v3.5.6`
 +... Consider direct deploy with `npm publish --otp <otp>` from `gremlint/` - if using this method, ensure the `npm` version aligns with the one expected by the branch.
- .. `git tag gremlin-go/v3.6.1`
- .. `git push origin gremlin-go/v3.6.1`
++.. `git tag gremlin-go/v3.6.3`
++.. `git push origin gremlin-go/v3.6.3`
++.. `GOPROXY=proxy.golang.org go list -m github.com/apache/tinkerpop/gremlin-go/v3@v3.6.3`
  . Review the GLV releases
  .. link:https://pypi.org/project/gremlinpython/[gremlin-python - PyPi]
  .. link:https://www.nuget.org/packages/Gremlin.Net/[Gremlin.Net - nuget]