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 2023/01/14 01:02:56 UTC
[tinkerpop] branch master updated (4320add17f -> 415e140551)
This is an automated email from the ASF dual-hosted git repository.
valentyn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 4320add17f Merge branch '3.6-dev'
add 282a91814d Improved handling of cases where Gremlin Version is not available
add e062140603 TINKERPOP-2847 Compare and store request UUIDs as lower case strings in gremlin-javascript.
add 3992be1f29 Merge pull request #1940 from Bit-Quill/ken/TINKERPOP-2847
add bcee628865 Merge branch '3.5-dev' into cole/user-agent-manifest-fix
add 9fde73d1c0 Merge pull request #1937 from Bit-Quill/cole/user-agent-manifest-fix
add 4801a13089 Merge branch '3.5-dev' into 3.6-dev
new 415e140551 merge from 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:
CHANGELOG.asciidoc | 2 ++
.../org/apache/tinkerpop/gremlin/util/Gremlin.java | 11 +++++-
.../apache/tinkerpop/gremlin/driver/UserAgent.java | 41 +++++++++++++++-------
.../gremlin-javascript/lib/driver/connection.js | 10 ++++--
.../javascript/gremlin-javascript/lib/utils.js | 9 +++--
5 files changed, 55 insertions(+), 18 deletions(-)
[tinkerpop] 01/01: merge from 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 master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 415e140551b730f44f58219230569fe1ae2d6a36
Merge: 4320add17f 4801a13089
Author: Valentyn Kahamlyk <va...@bitquilltech.com>
AuthorDate: Fri Jan 13 17:02:49 2023 -0800
merge from 3.6-dev
CHANGELOG.asciidoc | 2 ++
.../org/apache/tinkerpop/gremlin/util/Gremlin.java | 11 +++++-
.../apache/tinkerpop/gremlin/driver/UserAgent.java | 41 +++++++++++++++-------
.../gremlin-javascript/lib/driver/connection.js | 10 ++++--
.../javascript/gremlin-javascript/lib/utils.js | 9 +++--
5 files changed, 55 insertions(+), 18 deletions(-)
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
index 58394ab16a,db8e8adfd0..e6ed25b99d
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
@@@ -26,10 -26,15 +26,15 @@@ import java.io.IOException
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
public final class Gremlin {
- private static String version;
+ private static final String version;
static {
- version = Manifests.read("tinkerpop-version");
+ try {
- version = Manifests.read("version");
++ version = Manifests.read("tinkerpop-version");
+ }
+ catch (Exception e) {
+ version = "VersionNotFound";
+ }
}
private Gremlin() {