Merge branch 'tp32'
Conflicts:
gremlin-archetype/gremlin-archetype-dsl/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/512ca3a7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/512ca3a7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/512ca3a7
Branch: refs/heads/TINKERPOP-1686
Commit: 512ca3a7d165ac56c31b5215412b4d918de28f62
Parents: 2ef70ef 030f556
Author: Stephen Mallette <[email protected]>
Authored: Thu Jun 8 12:49:42 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Thu Jun 8 12:49:42 2017 -0400
----------------------------------------------------------------------
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/512ca3a7/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --cc gremlin-archetype/gremlin-archetype-dsl/pom.xml
index f5c8049,d1f0ea4..c52bc75
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@@ -4,9 -19,9 +19,9 @@@ limitations under the License
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>gremlin-archetype</artifactId>
<groupId>org.apache.tinkerpop</groupId>
+ <artifactId>gremlin-archetype</artifactId>
- <version>3.2.5-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-dsl</artifactId>
