Merge branch '3.7-dev' into fix-tests

apache · Nov 9, 2024 · cd7c3b5 · cd7c3b5
2 parents 6505486 + 53270ca
commit cd7c3b5
Show file tree

Hide file tree

Showing 10,207 changed files with 299,146 additions and 252,772 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -3,6 +3,7 @@ github:
   homepage: https://tinkerpop.apache.org/
   dependabot_alerts: false
   dependabot_updates: false
+  del_branch_on_merge: true
   labels:
     - tinkerpop
     - gremlin

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -24,11 +24,59 @@ updates:
     labels:
       - "javascript"
       - "dependencies"
+    ignore:
+      - dependency-name: "prettier"
+        update-types: ["version-update:semver-patch"]
   - package-ecosystem: "npm"
     directory: "/gremlint"
     schedule:
       interval: "daily"
     target-branch: "3.5-dev"
     labels:
-      - "javascript"
-      - "dependencies"
+      - "gremlint"
+      - "dependencies"
+    ignore:
+      - dependency-name: "prettier"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "@types/node"
+        update-types: [ "version-update:semver-patch" ]
+  - package-ecosystem: "npm"
+    directory: "/docs/gremlint"
+    schedule:
+      interval: "daily"
+    target-branch: "master"
+    labels:
+      - "gremlint"
+      - "dependencies"
+    ignore:
+      - dependency-name: "prettier"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "@types/*"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "styled-components"
+        update-types: [ "version-update:semver-patch" ]
+      - dependency-name: "@testing-library/jest-dom"
+        update-types: [ "version-update:semver-patch" ]
+  - package-ecosystem: "gomod"
+    directory: "/gremlin-go"
+    schedule:
+      interval: "daily"
+    target-branch: "3.5-dev"
+    labels:
+      - "go"
+      - "dependencies"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "3.5-dev"
+    labels:
+      - "java"
+      - "dependencies"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "3.5-dev"
+    labels:
+      - "dependencies"
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -14,6 +14,20 @@ jobs:
           distribution: 'temurin'
       - name: Build with Maven
         run: mvn clean install -DskipTests -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+  java-jdk17:
+    name: mvn clean install - jdk17
+    timeout-minutes: 45
+    needs: smoke
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Build with Maven
+        run: mvn clean install -pl -:gremlin-javascript,-:gremlin-dotnet-source,-:gremlin-dotnet-tests,-:gremlin-go,-:gremlin-python -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
   java-jdk11:
     name: mvn clean install - jdk11
     timeout-minutes: 45

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "3.5-dev", "3.6-dev" ]
+    branches: [ "master", "3.5-dev", "3.6-dev", "3.7-dev" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master", "3.5-dev", "3.6-dev" ]
+    branches: [ "master", "3.5-dev", "3.6-dev", "3.7-dev" ]
   schedule:
     - cron: '22 8 * * 1'
 

diff --git a/.mailmap b/.mailmap
@@ -18,3 +18,9 @@ Dave Bechberger                  <bechbd@users.noreply.github.com>
 Stephen Mallette                 <spmallette@users.noreply.github.com>
 Stephen Mallette                 <spmva@genoprime.com>
 Stephen Mallette                 <spmva@genprime.com>
+Valentyn Kahamlyk                <vkagamlyk@users.noreply.github.com>
+Valentyn Kahamlyk                <valentynk@bitquilltech.com>
+Jorge Bay-Gondra                 <jorgebaygondra@gmail.com>
+Jorge Bay-Gondra                 <jorgebaygondra@gmail.com>
+
+
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
diff --git a/LICENSE b/LICENSE
@@ -209,5 +209,7 @@ The Apache TinkerPop project bundles the following components under the MIT Lice
 
      bootstrap 5.0.0 (http://getbootstrap.com/) - for details, see licenses/bootstrap
      jquery 1.11.0 (https://jquery.com/) - for details, see licenses/jquery
-     normalize.css 2.1.2 (http://necolas.github.io/normalize.css/) - for details, see licenses/normalize
-     prism.css/js 1.27.0 (http://prismjs.com) - for details, see licenses/prism
+     normalize.css 2.1.2 (https://necolas.github.io/normalize.css/) - for details, see licenses/normalize
+     prism.css/js 1.27.0 (https://prismjs.com/) - for details, see licenses/prism
+     wow.js 1.1.2 (https://wowjs.uk/) - for details, see licenses/wow
+     chai 5.0.0 (https://www.chaijs.com/) - for details, see licenses/chai
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
@@ -140,8 +140,9 @@ if [ "${TYPE}" = "SOURCE" ]; then
 cd ${DIR_NAME}
 echo -n "* checking source files ... "
 find . -type f | xargs -n1 -I {} file {} --mime | grep 'charset=binary' | cut -f1 -d: |
-  grep -Pv '^\./docs/(static|(site/home))/(img|images|fonts)/((icons|logos|policy|resources|providers|community|use-cases|gremlin|download)/)?[^/]*\.(png|jpg|ico|pdf|eot|otf|woff|woff2|ttf)$' |
+  grep -Pv '^\./docs/(static|(site/home))/(img|images|fonts)/((icons|logos|policy|resources|providers|community|use-cases|gremlin|download|social)/)?[^/]*\.(png|jpg|ico|pdf|eot|otf|woff|woff2|ttf)$' |
   grep -Pv '^\./docs/gremlint/(src|public)/[^/]*\.(png|jpg|ico)$' |
+  grep -Pv '^\./docs/original/(ai/)?[^/]*\.(png|jpg|ico|ai)$' |
   grep -Pv '^./gremlin-dotnet/src/images/[^/]*\.(png|ico)$' |
   grep -Pv '^./gremlin-dotnet/.*\.snk$' |
   grep -Pv '^./gremlin-server/src/test/resources/[^/]*\.(p12|jks)$' |

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM ubuntu:focal
+FROM --platform=linux/amd64 ubuntu:focal
 
 LABEL maintainer="Daniel Kuppitz <me@gremlin.guru>"
 

diff --git a/docker/build/Dockerfile.template b/docker/build/Dockerfile.template
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM tinkerpop:hadoop-HADOOP_VERSION
+FROM --platform=linux/amd64 tinkerpop:hadoop-HADOOP_VERSION
 
 RUN mkdir -p /usr/src/tinkerpop
 WORKDIR /usr/src/tinkerpop

diff --git a/docker/gremlin-server/docker-entrypoint.sh b/docker/gremlin-server/docker-entrypoint.sh
@@ -23,21 +23,17 @@ cp /opt/test/scripts/* ${TINKERPOP_HOME}/scripts
 
 IP=$(hostname -i)
 
-INCLUDE_NEO4J=
-
 function usage {
   echo -e "\nUsage: `basename $0` <version> [OPTIONS]" \
           "\nStart Gremlin Server instances that match the Maven integration test environment." \
           "\n\nOptions are:\n" \
           "\n\t<version> This value is optional and if unspecified will build the current version" \
-          "\n\t-n, --neo4j              include Neo4j to make transactions testable" \
           "\n\t-h, --help               show this message" \
           "\n"
 }
 
 while [ ! -z "$1" ]; do
   case "$1" in
-    -n | --neo4j ) INCLUDE_NEO4J=true; shift ;;
     -h | --help ) usage; exit 0 ;;
     *) usage 1>&2; exit 1 ;;
   esac
@@ -51,10 +47,6 @@ echo "ws://${IP}:45940/gremlin with anonymous access"
 echo "ws://${IP}:45941/gremlin with basic authentication (stephen/password)"
 echo "ws://${IP}:45942/gremlin with kerberos authentication (stephen/password)"
 echo
-if [ ! -z "${INCLUDE_NEO4J}" ]; then
-  echo Installing Neo4j to the environment: transactions are testable on port 45940
-  echo
-fi
 echo "See docker/gremlin-server/docker-entrypoints.sh for transcripts per GLV."
 echo "#############################################################################"
 
@@ -65,15 +57,6 @@ java -version
 dos2unix /opt/gremlin-server/bin/gremlin-server.sh
 dos2unix /opt/gremlin-server/bin/gremlin-server.conf
 
-# dynamically installs Neo4j libraries so that we can test variants with transactions,
-# but only only port 45940 is configured with the neo4j graph as the neo4j-empty.properties
-# is statically pointing at a temp directory and that space can only be accessed by one
-# graph at a time
-if [ ! -z "${INCLUDE_NEO4J}" ]; then
-  sed -i 's/graphs: {/graphs: {\n  tx: conf\/neo4j-empty.properties,/' ${TINKERPOP_HOME}/conf/gremlin-server-integration.yaml
-  /opt/gremlin-server/bin/gremlin-server.sh install org.apache.tinkerpop neo4j-gremlin ${GREMLIN_SERVER_VERSION}
-fi
-
 /opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration.yaml &
 
 /opt/gremlin-server/bin/gremlin-server.sh ${TINKERPOP_HOME}/conf/gremlin-server-integration-secure.yaml &

diff --git a/docker/gremlin-server/gremlin-server-integration-krb5.yaml b/docker/gremlin-server/gremlin-server-integration-krb5.yaml
@@ -24,7 +24,9 @@ graphs: {
   modern: conf/tinkergraph-empty.properties,
   crew: conf/tinkergraph-empty.properties,
   grateful: conf/tinkergraph-empty.properties,
-  sink: conf/tinkergraph-empty.properties}
+  sink: conf/tinkergraph-empty.properties,
+  tx: conf/tinkertransactiongraph-empty.properties
+}
 scriptEngines: {
   gremlin-lang : {},
   gremlin-groovy: {
@@ -34,11 +36,11 @@ scriptEngines: {
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}

diff --git a/docker/gremlin-server/gremlin-server-integration-secure.yaml b/docker/gremlin-server/gremlin-server-integration-secure.yaml
@@ -24,7 +24,9 @@ graphs: {
   modern: conf/tinkergraph-empty.properties,
   crew: conf/tinkergraph-empty.properties,
   grateful: conf/tinkergraph-empty.properties,
-  sink: conf/tinkergraph-empty.properties}
+  sink: conf/tinkergraph-empty.properties,
+  tx: conf/tinkertransactiongraph-empty.properties
+}
 scriptEngines: {
   gremlin-lang : {},
   gremlin-groovy: {
@@ -34,11 +36,11 @@ scriptEngines: {
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}

diff --git a/docker/gremlin-server/gremlin-server-integration.yaml b/docker/gremlin-server/gremlin-server-integration.yaml
@@ -26,7 +26,8 @@ graphs: {
   modern: conf/tinkergraph-service.properties,
   crew: conf/tinkergraph-service.properties,
   grateful: conf/tinkergraph-service.properties,
-  sink: conf/tinkergraph-service.properties
+  sink: conf/tinkergraph-service.properties,
+  tx: conf/tinkertransactiongraph-service.properties
 }
 scriptEngines: {
   gremlin-lang : {},
@@ -37,11 +38,11 @@ scriptEngines: {
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-all.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }}
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV2, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV1, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1] }}
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1 }
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.standard.StandardOpProcessor, config: {}}

diff --git a/docker/gremlin-test-server/Dockerfile b/docker/gremlin-test-server/Dockerfile
@@ -37,5 +37,5 @@ ENV GREMLIN_SERVER_VERSION=$GREMLIN_SERVER
 
 EXPOSE 45940-45942 4588
 
-ENTRYPOINT ["/opt/docker-entrypoint.sh", "-n"]
+ENTRYPOINT ["/opt/docker-entrypoint.sh"]
 CMD []
diff --git a/docker/hadoop/Dockerfile.template b/docker/hadoop/Dockerfile.template
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM tinkerpop:base
+FROM --platform=linux/amd64 tinkerpop:base
 
 LABEL maintainer="Daniel Kuppitz <me@gremlin.guru>"