[tinkerpop] branch 3.6-dev updated (b1db52017f -> b663e04c8a)

[ly...@apache.org]

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

lyndonb pushed a change to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from b1db52017f Merge branch '3.5-dev' into 3.6-dev
     add 4927388e0c updating pathing for cucumber versions
     new b663e04c8a Merge '3.5-dev' into 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:
 gremlin-go/build/generate.groovy                  | 2 +-
 gremlin-go/driver/cucumber/cucumberSteps_test.go  | 2 +-
 gremlin-go/driver/cucumber/cucumberWorld.go       | 2 +-
 gremlin-go/driver/cucumber/gremlin.go             | 2 +-
 gremlin-go/driver/performance/performanceSuite.go | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

[tinkerpop] 01/01: Merge '3.5-dev' into 3.6-dev

[ly...@apache.org]

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

lyndonb pushed a commit to branch 3.6-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit b663e04c8a978981e3d416c263940fc5196fdf05
Merge: b1db52017f 4927388e0c
Author: Lyndon Bauto <ly...@bitquilltech.com>
AuthorDate: Mon May 30 17:05:55 2022 -0700

    Merge '3.5-dev' into 3.6-dev

 gremlin-go/build/generate.groovy                  | 2 +-
 gremlin-go/driver/cucumber/cucumberSteps_test.go  | 2 +-
 gremlin-go/driver/cucumber/cucumberWorld.go       | 2 +-
 gremlin-go/driver/cucumber/gremlin.go             | 2 +-
 gremlin-go/driver/performance/performanceSuite.go | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --cc gremlin-go/build/generate.groovy
index a9b85eaea0,601d4ac548..0e71b17513
--- a/gremlin-go/build/generate.groovy
+++ b/gremlin-go/build/generate.groovy
@@@ -92,8 -75,7 +92,8 @@@ radishGremlinFile.withWriter('UTF-8') 
          '\n' +
          'import (\n' +
          '\t \"errors\"\n' +
 +        '\t \"math\"\n' +
-         '\t \"github.com/apache/tinkerpop/gremlin-go/driver\"\n' +
+         '\t \"github.com/apache/tinkerpop/gremlin-go/v3/driver\"\n' +
          ')\n'
      )
  
diff --cc gremlin-go/driver/cucumber/cucumberSteps_test.go
index ef4067825e,7cb66df599..7b37a95ba6
--- a/gremlin-go/driver/cucumber/cucumberSteps_test.go
+++ b/gremlin-go/driver/cucumber/cucumberSteps_test.go
@@@ -24,9 -24,8 +24,9 @@@ import 
  	"encoding/json"
  	"errors"
  	"fmt"
- 	"github.com/apache/tinkerpop/gremlin-go/driver"
+ 	"github.com/apache/tinkerpop/gremlin-go/v3/driver"
  	"github.com/cucumber/godog"
 +	"math"
  	"reflect"
  	"regexp"
  	"strconv"
diff --cc gremlin-go/driver/cucumber/gremlin.go
index 5349cb3b98,d4b384d6d9..509b1d8b86
--- a/gremlin-go/driver/cucumber/gremlin.go
+++ b/gremlin-go/driver/cucumber/gremlin.go
@@@ -26,8 -26,7 +26,8 @@@ package gremling
  
  import (
  	 "errors"
 +	 "math"
- 	 "github.com/apache/tinkerpop/gremlin-go/driver"
+ 	 "github.com/apache/tinkerpop/gremlin-go/v3/driver"
  )
  
  var translationMap = map[string][]func(g *gremlingo.GraphTraversalSource, p map[string]interface{}) *gremlingo.GraphTraversal{