You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2021/12/28 19:14:36 UTC

[tinkerpop] branch ci-fix updated (477926f -> 08a8c6c)

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

spmallette pushed a change to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


 discard 477926f  Revert "Changes to address re-try failures on initially dead host"
    omit 9ab9433  Changed seconds to minutes for timeout - oops CTR
    omit b51c97e  Added transaction testing to Gremlin Server for CI CTR
    omit 5db8aad  Bump to Netty 4.1.72 CTR
    omit 8c7a1a5  Bump to maven 3.8.x in docker image CTR
    omit 96ccc21  TINKERPOP-2626 Prevent premature close of traversal
    omit a013c52  Add a neo4j build to CI CTR
    omit 4c50cf2  Minor dev doc updates CTR
    omit b82c47a  TINKERPOP-2630 Clarifying note on GraphSON 1.0 configuration CTR
    omit de6a61a  TINKERPOP-2632 Bumped to Netty 4.1.68 CTR
    omit 7dccf95  TINKERPOP-2630 Added some docs around GraphSON 1.0 CTR
    omit d276458  Fixed spelling CTR
    omit 37015cd  Merge branch 'pr-1484' into 3.4-dev
    omit d172357  Removed junit assertThat() for hamcrest CTR
    omit 31e8c0a  Added TextP to common imports for python CTR
    omit 6c1cc0c  3.4 - Retain failure context in NoHostAvailableException
    omit b7c814e  Merge branch 'pr-1476' into 3.4-dev
    omit 586ec3d  Changes to address re-try failures on initially dead host
     new 935508f  Added TextP to common imports for python CTR
     new f51a8d7  Removed junit assertThat() for hamcrest CTR
     new 1944cd9  Fixed spelling CTR
     new 9876be6  TINKERPOP-2630 Added some docs around GraphSON 1.0 CTR
     new 6eeb82c  TINKERPOP-2632 Bumped to Netty 4.1.68 CTR
     new a02dd75  TINKERPOP-2630 Clarifying note on GraphSON 1.0 configuration CTR
     new 853ea1e  Minor dev doc updates CTR
     new 94b1011  Add a neo4j build to CI CTR
     new 150500c  TINKERPOP-2626 Prevent premature close of traversal
     new 56a41d9  Bump to maven 3.8.x in docker image CTR
     new 483cc50  Bump to Netty 4.1.72 CTR
     new ede876f  Added transaction testing to Gremlin Server for CI CTR
     new 08a8c6c  Changed seconds to minutes for timeout - oops CTR

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (477926f)
            \
             N -- N -- N   refs/heads/ci-fix (08a8c6c)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 13 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:
 CHANGELOG.asciidoc                                 |  1 -
 .../apache/tinkerpop/gremlin/driver/Client.java    | 18 ++--------
 .../driver/exception/NoHostAvailableException.java |  4 ---
 .../gremlin/server/GremlinDriverIntegrateTest.java |  8 ++---
 .../server/GremlinServerAuthIntegrateTest.java     |  4 +--
 .../server/GremlinServerSslIntegrateTest.java      | 42 +++++++++++++---------
 .../gremlin/server/util/ExceptionTestUtils.java    | 34 ------------------
 7 files changed, 35 insertions(+), 76 deletions(-)
 delete mode 100644 gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/ExceptionTestUtils.java

[tinkerpop] 02/13: Removed junit assertThat() for hamcrest CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit f51a8d73d17a6bfdf7234c13820de2697fad6da5
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Oct 7 07:50:27 2021 -0400

    Removed junit assertThat() for hamcrest CTR
---
 .../gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
index 3a64b98..7a4b00f 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorIntegrateTest.java
@@ -42,10 +42,10 @@ import java.util.stream.Collectors;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 /**

[tinkerpop] 11/13: Bump to Netty 4.1.72 CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 483cc50a4c99d987e493c8c8858419a6f1dc32ad
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Dec 15 12:39:08 2021 -0500

    Bump to Netty 4.1.72 CTR
---
 CHANGELOG.asciidoc | 2 +-
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1504016..0eda5e4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,7 +27,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Prevented XML External Entity (XXE) style attacks via `GraphMLReader` by disabling DTD and external entities by default.
 * Improved error message for failed serialization for HTTP-based requests.
 * Fixed a `NullPointerException` that could occur during a failed `Connection` initialization due to uninstantiated `AtomicInteger`.
-* Bumped to Netty 4.1.68.
+* Bumped to Netty 4.1.72.
 
 [[release-3-4-12]]
 === TinkerPop 3.4.12 (Release Date: July 19, 2021)
diff --git a/pom.xml b/pom.xml
index b2ad55f..5503889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@ limitations under the License.
         <jcabi.version>1.1</jcabi.version>
         <log4j.version>1.2.17</log4j.version>
         <metrics.version>3.0.2</metrics.version>
-        <netty.version>4.1.68.Final</netty.version>
+        <netty.version>4.1.72.Final</netty.version>
         <slf4j.version>1.7.25</slf4j.version>
         <snakeyaml.version>1.27</snakeyaml.version>
         <spark.version>2.4.0</spark.version>

[tinkerpop] 01/13: Added TextP to common imports for python CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 935508f4334dd02455696e69cc86c708d6b7caa0
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Oct 7 06:50:57 2021 -0400

    Added TextP to common imports for python CTR
---
 docs/src/reference/gremlin-variants.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index 74a790e..c7ad26c 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -733,6 +733,7 @@ from gremlin_python.process.traversal import Column
 from gremlin_python.process.traversal import Direction
 from gremlin_python.process.traversal import Operator
 from gremlin_python.process.traversal import P
+from gremlin_python.process.traversal import TextP
 from gremlin_python.process.traversal import Pop
 from gremlin_python.process.traversal import Scope
 from gremlin_python.process.traversal import Barrier

[tinkerpop] 06/13: TINKERPOP-2630 Clarifying note on GraphSON 1.0 configuration CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit a02dd7579b70aa9cd23a2314c7040a6ab5bcc1c9
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Oct 25 14:18:20 2021 -0400

    TINKERPOP-2630 Clarifying note on GraphSON 1.0 configuration CTR
---
 docs/src/reference/gremlin-applications.asciidoc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index ecd11b2..748c04c 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1561,6 +1561,11 @@ $ curl -H "Accept:application/vnd.gremlin-v3.0+json" -X POST -d "{\"gremlin\":\"
 {"requestId":"9fdf0892-d86c-41f2-94b5-092785c473eb","status":{"message":"","code":200,"attributes":{"@type":"g:Map","@value":[]}},"result":{"data":{"@type":"g:List","@value":[{"@type":"g:Int32","@value":99}]},"meta":{"@type":"g:Map","@value":[]}}
 ----
 
+IMPORTANT: `GraphSONMessageSerializerGremlinV1d0` configures `application/vnd.gremlin-v1.0+json`, but this mime type does
+not support text serialization (i.e. `MessageTextSerializer`) which means that it cannot be used for the serializing
+results to the HTTP endpoint in Gremlin Server. GraphSON 1.0 must be configured with `application/json` using the
+`GraphSONMessageSerializerV1d0` as demonstrated above.
+
 ===== Gryo
 
 The Gryo serializer utilizes Kryo-based serialization which produces a binary output.  This format is best consumed

[tinkerpop] 08/13: Add a neo4j build to CI CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 94b10119ba553a5ea20708e0895b3da9dbed5365
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Oct 27 07:27:46 2021 -0400

    Add a neo4j build to CI CTR
---
 .github/workflows/build-test.yml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 5f34973..4a6286f 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -158,4 +158,20 @@ jobs:
           touch gremlin-dotnet/src/.glv
           touch gremlin-dotnet/test/.glv
           mvn clean install -pl -:gremlin-javascript,-:gremlin-python -q -DskipTests -Dci
-          mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet
\ No newline at end of file
+          mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet
+  neo4j-gremlin:
+    name: neo4j-gremlin
+    timeout-minutes: 1200 # 20 minutes
+    needs: smoke
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name: Build with Maven
+        run: |
+          mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
+          mvn verify -pl :neo4j-gremlin -DincludeNeo4j
\ No newline at end of file

[tinkerpop] 09/13: TINKERPOP-2626 Prevent premature close of traversal

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 150500ca5a9f0dc33ee62f54b158c6eccebe89f3
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri Nov 19 10:40:22 2021 -0500

    TINKERPOP-2626 Prevent premature close of traversal
    
    This is not a complete fix for this issue but does get rid of the premature close. Opted to try to close the Traversal as part of hasNext() as in a sense it is a way to complete iteration of the traversal. Without that change certain tests begin to fail so some additional change besides removing the premature close had to be added.
---
 CHANGELOG.asciidoc                                                    | 1 +
 .../gremlin/process/traversal/step/filter/RangeGlobalStep.java        | 3 ---
 .../tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java    | 4 +++-
 .../apache/tinkerpop/gremlin/structure/util/CloseableIterator.java    | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7895524..1504016 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 [[release-3-4-13]]
 === TinkerPop 3.4.13 (Release Date: NOT OFFICIALLY RELEASED YET)
 
+* Fixed `RangeGlobalStep` which was prematurely closing the iterator.
 * Prevented XML External Entity (XXE) style attacks via `GraphMLReader` by disabling DTD and external entities by default.
 * Improved error message for failed serialization for HTTP-based requests.
 * Fixed a `NullPointerException` that could occur during a failed `Connection` initialization due to uninstantiated `AtomicInteger`.
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeGlobalStep.java
index 37441eb..9824332 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeGlobalStep.java
@@ -63,9 +63,6 @@ public final class RangeGlobalStep<S> extends FilterStep<S> implements Ranging,
         if (this.bypass) return true;
 
         if (this.high != -1 && this.counter.get() >= this.high) {
-            // This is a global step and this place would be the end of the traversal.
-            // Close the traversal to free up resources.
-            CloseableIterator.closeIterator(traversal);
             throw FastNoSuchElementException.instance();
         }
 
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
index cd3b7c4..3aa7bc1 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java
@@ -193,7 +193,9 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
     @Override
     public boolean hasNext() {
         if (!this.locked) this.applyStrategies();
-        return this.lastTraverser.bulk() > 0L || this.finalEndStep.hasNext();
+        final boolean more = this.lastTraverser.bulk() > 0L || this.finalEndStep.hasNext();
+        if (!more) CloseableIterator.closeIterator(this);
+        return more;
     }
 
     @Override
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/CloseableIterator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/CloseableIterator.java
index 2464d11..5c33f8d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/CloseableIterator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/CloseableIterator.java
@@ -51,8 +51,7 @@ public interface CloseableIterator<T> extends Iterator<T>, Closeable {
         if (iterator instanceof AutoCloseable) {
             try {
                 ((AutoCloseable) iterator).close();
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 throw new RuntimeException(e);
             }
         }

[tinkerpop] 07/13: Minor dev doc updates CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 853ea1e185393e9cebd5ee433a5fb04c3a81a049
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Oct 27 07:25:20 2021 -0400

    Minor dev doc updates CTR
---
 docs/src/dev/developer/for-committers.asciidoc | 9 ++++-----
 docs/src/dev/developer/release.asciidoc        | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc
index 5054a70..e272b49 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -163,11 +163,10 @@ be adjusted accordingly to not auto-wildcard the imports.
 
 == Build Server
 
-TinkerPop uses link:https://travis-ci.com/[Travis] for link:https://en.wikipedia.org/wiki/Continuous_integration[CI]
-services. The build status can be found link:https://travis-ci.org/apache/tinkerpop[here].  Note that the CI process
-does not run all possible tests (e.g. Neo4j-related tests) as a full execution would likely exceed the allowable times
-for builds on these servers. Instead Travis runs a basic cross-section of tests selected to provide a reasonably high
-degree of confidence in the branch built.
+TinkerPop uses link:https://docs.github.com/en/actions[GitHub Actions] for link:https://en.wikipedia.org/wiki/Continuous_integration[CI]
+services. The build status can be found link:https://github.com/apache/tinkerpop/actions[here]. There is a single
+"build-test" workflow that runs a number of jobs that break the test execution into a series of smaller test executions.
+Taken together, they provide a solid cross section of coverage of the code base
 
 == Deprecation
 
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 9c62034..f175c50 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -289,6 +289,8 @@ as one individual may simply just handle them all.
 . Generate a list of dead branches that will be automatically deleted and post them as a DISCUSS thread for review, then once consensus is reached removed those branches.
 . Set up the IO tests for the current `SNAPSHOT` as discussed in the <<io,IO Documentation and Testing Section>>
 
+Apache provides access to download statistics for release link:https://logging1-he-de.apache.org/stats/[here].
+
 == Email Templates
 
 === Release VOTE

[tinkerpop] 04/13: TINKERPOP-2630 Added some docs around GraphSON 1.0 CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 9876be64910a5615375421e8a4543e0fe67f1d8e
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Oct 25 08:03:50 2021 -0400

    TINKERPOP-2630 Added some docs around GraphSON 1.0 CTR
---
 docs/src/reference/gremlin-applications.asciidoc | 48 +++++++++++++++++-------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index ffce0c0..ecd11b2 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -812,6 +812,7 @@ the one in `conf/remote.yaml` should perform better.
 NOTE: Console commands, those that begin with a colon (e.g. `:x`, `:remote`) do not execute remotely when in this mode.
 They are all still evaluated locally.
 
+[[connecting-via-http]]
 === Connecting via HTTP
 
 image:gremlin-rexster.png[width=225,float=left] While the default behavior for Gremlin Server is to provide a
@@ -1514,12 +1515,10 @@ link:https://tinkerpop.apache.org/docs/current/dev/io/#graphson[IO Documentation
 
 [source,yaml]
 ----
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 }
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0 }
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0 }
 ----
 
-The above configuration represents the default serialization under the `application/json` MIME type and produces JSON
-consistent with standard JSON data types.  It has the following configuration option:
+Gremlin Server is configured by default with GraphSON 3.0 as shown above. It has the following configuration option:
 
 [width="100%",cols="3,10,^2",options="header"]
 |=========================================================
@@ -1527,19 +1526,40 @@ consistent with standard JSON data types.  It has the following configuration op
 |ioRegistries |A list of `IoRegistry` implementations to be applied to the serializer. |_none_
 |=========================================================
 
+It is worth noting that GraphSON 1.0 still has some appeal for some users as it can be configured to produce an untyped
+JSON format which is a bit easier to consume than its successors which embed data types into the output. This version
+of GraphSON tends to be the one that users like to utilize when <<connecting-via-http,connecting via HTTP>> and is still
+used by some <<connecting-rgp, Remote Gremlin Providers>> for this purpose.
+
+To configure Gremlin Server this way, the `GraphSONMessageSerializerV1d0` must be included:
+
 [source,yaml]
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0 }
+----
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 }
+  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0 }
+----
 
-When the standard JSON data types are not enough (e.g. need to identify the difference between `double` and `float`
-data types), the above configuration will embed types into the JSON itself.  The type embedding uses standard Java
-type names, so interpretation from non-JVM languages will be required.  It has the MIME type of
-`application/vnd.gremlin-v1.0+json` and the following configuration options:
+In the above situation, both `GraphSONMessageSerializerV1d0` and `GraphSONMessageSerializerV3d0` each bind to the
+`application/json` mime type. When such conflicts arise, Gremlin Server will use the order of the serializers to
+determine priority such that the first serializer to bind to a type will be used and the others ignored. The following
+log message will indicate how the server is ultimately configured:
 
-[width="100%",cols="3,10,^2",options="header"]
-|=========================================================
-|Key |Description |Default
-|ioRegistries |A list of `IoRegistry` implementations to be applied to the serializer. |_none_
-|=========================================================
+[source,text]
+----
+[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v3.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0
+[INFO] AbstractChannelizer - application/json already has org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 configured - it will not be replaced by org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, change order of serialization configuration if this is not desired.
+----
+
+Given the above, using GraphSON 3.0 under this configuration will require that the user specific the type:
+
+[source,text]
+----
+$ curl -X POST -d "{\"gremlin\":\"100-1\"}" "http://localhost:8182"
+{"requestId":"f8720ad9-2c8b-4eef-babe-21792a3e3157","status":{"message":"","code":200,"attributes":{}},"result":{"data":[99],"meta":{}}}
+$ curl -H "Accept:application/vnd.gremlin-v3.0+json" -X POST -d "{\"gremlin\":\"100-1\"}" "http://localhost:8182"
+{"requestId":"9fdf0892-d86c-41f2-94b5-092785c473eb","status":{"message":"","code":200,"attributes":{"@type":"g:Map","@value":[]}},"result":{"data":{"@type":"g:List","@value":[{"@type":"g:Int32","@value":99}]},"meta":{"@type":"g:Map","@value":[]}}
+----
 
 ===== Gryo
 

[tinkerpop] 10/13: Bump to maven 3.8.x in docker image CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 56a41d98b810d5b931b494f56cbb48f2fb205c47
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Dec 6 09:57:38 2021 -0500

    Bump to maven 3.8.x in docker image CTR
---
 docker/build/Dockerfile.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/build/Dockerfile.template b/docker/build/Dockerfile.template
index 17084c9..a897a05 100644
--- a/docker/build/Dockerfile.template
+++ b/docker/build/Dockerfile.template
@@ -23,4 +23,4 @@ COPY . /usr/src/tinkerpop
 RUN chmod 744 ./.travis.install-maven.sh
 ENV M2_HOME /root/mvn-home
 ENV PATH ${M2_HOME}/bin:${PATH}
-RUN ./.travis.install-maven.sh 3.3.9 ${M2_HOME}
+RUN ./.travis.install-maven.sh 3.8.4 ${M2_HOME}

[tinkerpop] 12/13: Added transaction testing to Gremlin Server for CI CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit ede876f7f83cbde58d4d23d59d4b56b0da79308c
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Tue Dec 21 21:21:32 2021 -0500

    Added transaction testing to Gremlin Server for CI CTR
---
 .github/workflows/build-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 4a6286f..148fe91 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -43,7 +43,7 @@ jobs:
       - name: Build with Maven
         run: |
           mvn clean install -pl -:gremlin-javascript,-:gremlin-python,-gremlin-dotnet,-:gremlin-dotnet-source,-:gremlin-dotnet-tests -q -DskipTests -Dci
-          mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false
+          mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false -DincludeNeo4j
   spark-core:
     name: spark core
     timeout-minutes: 2700 # 45 minutes

[tinkerpop] 05/13: TINKERPOP-2632 Bumped to Netty 4.1.68 CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 6eeb82c082ad34e0dcca7989f0cd0bb4c3b40f9f
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Oct 25 12:01:17 2021 -0400

    TINKERPOP-2632 Bumped to Netty 4.1.68 CTR
---
 CHANGELOG.asciidoc | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 2d132d8..7895524 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Prevented XML External Entity (XXE) style attacks via `GraphMLReader` by disabling DTD and external entities by default.
 * Improved error message for failed serialization for HTTP-based requests.
 * Fixed a `NullPointerException` that could occur during a failed `Connection` initialization due to uninstantiated `AtomicInteger`.
+* Bumped to Netty 4.1.68.
 
 [[release-3-4-12]]
 === TinkerPop 3.4.12 (Release Date: July 19, 2021)
diff --git a/pom.xml b/pom.xml
index b41e2ba..b2ad55f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,7 +156,7 @@ limitations under the License.
         <jcabi.version>1.1</jcabi.version>
         <log4j.version>1.2.17</log4j.version>
         <metrics.version>3.0.2</metrics.version>
-        <netty.version>4.1.61.Final</netty.version>
+        <netty.version>4.1.68.Final</netty.version>
         <slf4j.version>1.7.25</slf4j.version>
         <snakeyaml.version>1.27</snakeyaml.version>
         <spark.version>2.4.0</spark.version>

[tinkerpop] 13/13: Changed seconds to minutes for timeout - oops CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 08a8c6cd8849aa2244d9c60c04bb332919aca9f1
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Dec 22 11:28:54 2021 -0500

    Changed seconds to minutes for timeout - oops CTR
---
 .github/workflows/build-test.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 148fe91..ec0b2e3 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 jobs:
   smoke:
     name: smoke
-    timeout-minutes: 600 # 10 minutes
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -16,7 +16,7 @@ jobs:
         run: mvn clean install -DskipTests -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
   java:
     name: mvn clean install
-    timeout-minutes: 2700 # 45 minutes
+    timeout-minutes: 45
     needs: smoke
     runs-on: ubuntu-latest
     steps:
@@ -30,7 +30,7 @@ jobs:
         run: mvn clean install -pl -:gremlin-javascript -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
   gremlin-server:
     name: gremlin-server
-    timeout-minutes: 2700 # 45 minutes
+    timeout-minutes: 45
     needs: smoke
     runs-on: ubuntu-latest
     steps:
@@ -46,7 +46,7 @@ jobs:
           mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false -DincludeNeo4j
   spark-core:
     name: spark core
-    timeout-minutes: 2700 # 45 minutes
+    timeout-minutes: 45
     needs: smoke
     runs-on: ubuntu-latest
     steps:
@@ -62,7 +62,7 @@ jobs:
           mvn verify -pl :spark-gremlin -DskipTests -DskipIntegrationTests=false '-Dit.test=*IntegrateTest,!SparkGryoSerializerGraphComputerProcessIntegrateTest'
   spark-gryo:
     name: spark gryo
-    timeout-minutes: 2700 # 45 minutes
+    timeout-minutes: 45
     needs: smoke
     runs-on: ubuntu-latest
     steps:
@@ -78,7 +78,7 @@ jobs:
           mvn verify -pl :spark-gremlin -DskipTests -DskipIntegrationTests=false -Dit.test=SparkGryoSerializerGraphComputerProcessIntegrateTest
   gremlin-console:
     name: gremlin-console
-    timeout-minutes: 1200 # 20 minutes
+    timeout-minutes: 20
     needs: smoke
     runs-on: ubuntu-latest
     steps:
@@ -94,7 +94,7 @@ jobs:
           mvn verify -pl :gremlin-console -DskipTests -DskipIntegrationTests=false
   javascript:
     name: javascript
-    timeout-minutes: 900 # 15 minutes
+    timeout-minutes: 15
     needs: smoke
     runs-on: ubuntu-latest
     steps:
@@ -110,7 +110,7 @@ jobs:
           mvn verify -pl :gremlin-javascript
   python:
     name: python
-    timeout-minutes: 1200 # 20 minutes
+    timeout-minutes: 20
     needs: smoke
     runs-on: ubuntu-latest
     steps:
@@ -139,7 +139,7 @@ jobs:
           mvn verify -pl gremlin-python
   dotnet:
     name: .NET
-    timeout-minutes: 1200 # 20 minutes
+    timeout-minutes: 20
     needs: smoke
     runs-on: ubuntu-latest
     steps:
@@ -161,7 +161,7 @@ jobs:
           mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet
   neo4j-gremlin:
     name: neo4j-gremlin
-    timeout-minutes: 1200 # 20 minutes
+    timeout-minutes: 20
     needs: smoke
     runs-on: ubuntu-latest
     steps:

[tinkerpop] 03/13: Fixed spelling CTR

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 1944cd99f7c96178c9f7e736ed1dac274821c790
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Oct 7 14:42:46 2021 -0400

    Fixed spelling CTR
---
 docs/src/upgrade/release-3.4.x.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/upgrade/release-3.4.x.asciidoc b/docs/src/upgrade/release-3.4.x.asciidoc
index f3cfe2d..4606131 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -197,7 +197,7 @@ See: link:https://issues.apache.org/jira/browse/TINKERPOP-2479[TINKERPOP-2479]
 The `withStrategies()` configuration step accepts a variable number of `TraversalStrategy` instances. In Java, those
 instances are typically constructed with `instance()` if it is a singleton or by way of a builder pattern which
 provides a fluent, type safe method to create the object. For Groovy, which is highly applicable to those who use
-Gremlin scripts in their applications or work a lot within tools similar to the Gremlin Cosnole, the builder syntax
+Gremlin scripts in their applications or work a lot within tools similar to the Gremlin Console, the builder syntax
 can work but doesn't really match the nature of the Groovy language. Using a strategy in this script context would
 look something like: