fixes #177

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         rust: [stable]
-        gremlin-server: [3.4.8]
+        gremlin-server: [3.5.5, 3.6.2]
     steps:
 
       - uses: actions/checkout@v2

docker-compose/credentials-version-1/Dockerfile → docker-compose/credentials/Dockerfile

@@ -2,5 +2,5 @@ ARG GREMLIN_SERVER
 
 FROM tinkerpop/gremlin-server:${GREMLIN_SERVER}
 
-COPY gremlin-server-credentials-v1.yaml /opt/gremlin-server/conf/
+COPY gremlin-server-credentials.yaml /opt/gremlin-server/conf/
 COPY server.jks /opt/gremlin-server/conf/

docker-compose/credentials-version-3/gremlin-server-credentials-v3.yaml → docker-compose/credentials/gremlin-server-credentials.yaml

@@ -25,7 +25,6 @@
 
 host: 0.0.0.0
 port: 8182
-scriptEvaluationTimeout: 30000
 channelizer: org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer
 graphs: {
   graph: conf/tinkergraph-empty.properties}
@@ -40,6 +39,7 @@ serializers:
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}            # application/vnd.gremlin-v3.0+gryo
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true }}                                                                      # application/vnd.gremlin-v3.0+gryo-stringd
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}        # application/json
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
 processors:

docker-compose/docker-compose.yaml

@@ -1,56 +1,20 @@
 version: "3"
 services:
-  gremlin-server-v3:
+  gremlin-server:
     build:
-      context: "./version-3"
+      context: "./simple"
       dockerfile: Dockerfile
       args:
         - GREMLIN_SERVER=${GREMLIN_SERVER}
-    command : ["conf/gremlin-server-v3.yaml"]
+    command : ["conf/gremlin-server.yaml"]
     ports:
       - "8182:8182"
-  gremlin-server-secure-v3:
+  gremlin-server-secure:
     build:
-      context: "./credentials-version-3"
+      context: "./credentials"
       dockerfile: Dockerfile
       args:
         - GREMLIN_SERVER=${GREMLIN_SERVER}
-    command : ["conf/gremlin-server-credentials-v3.yaml"]
+    command : ["conf/gremlin-server-credentials.yaml"]
     ports:
       - "8183:8182"
-  gremlin-server-v2:
-    build:
-      context: "./version-2"
-      dockerfile: Dockerfile
-      args:
-        - GREMLIN_SERVER=${GREMLIN_SERVER}
-    command : ["conf/gremlin-server-v2.yaml"]
-    ports:
-      - "8184:8182"
-  gremlin-server-secure-v2:
-    build:
-      context: "./credentials-version-2"
-      dockerfile: Dockerfile
-      args:
-        - GREMLIN_SERVER=${GREMLIN_SERVER}
-    command : ["conf/gremlin-server-credentials-v2.yaml"]
-    ports:
-      - "8185:8182"
-  gremlin-server-v1:
-    build:
-      context: "./version-1"
-      dockerfile: Dockerfile
-      args:
-        - GREMLIN_SERVER=${GREMLIN_SERVER}
-    command : ["conf/gremlin-server-v1.yaml"]
-    ports:
-      - "8186:8182"
-  gremlin-server-secure-v1:
-    build:
-      context: "./credentials-version-1"
-      dockerfile: Dockerfile
-      args:
-        - GREMLIN_SERVER=${GREMLIN_SERVER}
-    command : ["conf/gremlin-server-credentials-v1.yaml"]
-    ports:
-      - "8187:8182"

docker-compose/version-2/Dockerfile → docker-compose/simple/Dockerfile

@@ -2,4 +2,4 @@ ARG GREMLIN_SERVER
 
 FROM tinkerpop/gremlin-server:${GREMLIN_SERVER}
 
-COPY gremlin-server-v2.yaml /opt/gremlin-server/conf/
+COPY gremlin-server.yaml /opt/gremlin-server/conf/

docker-compose/version-3/gremlin-server-v3.yaml → docker-compose/simple/gremlin-server.yaml

@@ -17,7 +17,6 @@
 
 host: 0.0.0.0
 port: 8182
-scriptEvaluationTimeout: 30000
 graphs: {
   graph: conf/tinkergraph-empty.properties}
 scriptEngines: {
@@ -28,6 +27,7 @@ scriptEngines: {
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [scripts/generate-modern.groovy]}}}}
 serializers:
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV2d0] }}        # application/json
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV3d0] }}        # application/json
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1 }                                                                                                           # application/vnd.graphbinary-v1.0
   - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphBinaryMessageSerializerV1, config: { serializeResultToString: true }}                                                                 # application/vnd.graphbinary-v1.0-stringd
@@ -41,4 +41,4 @@ maxHeaderSize: 8192
 maxChunkSize: 8192
 maxContentLength: 65536
 maxAccumulationBufferComponents: 1024
-resultIterationBatchSize: 64
+resultIterationBatchSize: 64