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:57 UTC
[tinkerpop] 01/01: merge from 3.6-dev
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() {