You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ke...@apache.org on 2023/03/22 19:45:32 UTC

[tinkerpop] branch master updated (f69929f562 -> 125e5bf456)

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

kenhuuu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from f69929f562 Merge branch '3.6-dev'
     add d6973067f4 Updates Java UserAgent Error Handling
     add 8267422b1e Merge pull request #2000
     add 4f1595604b Merge branch '3.5-dev' into 3.6-dev
     new 125e5bf456 Merge branch '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:
 .../src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java        | 2 +-
 .../src/main/java/org/apache/tinkerpop/gremlin/driver/UserAgent.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

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

kenhuuu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 125e5bf4560546c9727dd25ff4d590f34c7d625b
Merge: f69929f562 4f1595604b
Author: Ken Hu <10...@users.noreply.github.com>
AuthorDate: Wed Mar 22 12:45:08 2023 -0700

    Merge branch '3.6-dev'

 .../src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java        | 2 +-
 .../src/main/java/org/apache/tinkerpop/gremlin/driver/UserAgent.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/Gremlin.java
index 0793046f8d,a03789e2c3..63781e0227
--- 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
@@@ -30,9 -30,9 +30,9 @@@ public final class Gremlin 
  
      static {
          try {
 -            version = Manifests.read("version");
 +            version = Manifests.read("tinkerpop-version");
          }
-         catch (Exception e) {
+         catch (Throwable t) {
              version = "VersionNotFound";
          }
      }