You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/04/17 11:06:03 UTC

[tinkerpop] branch master updated (cb49f6d -> f6a44cb)

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

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


    from cb49f6d  Switch to python3 specifically in gephi mock script.
     add 329f0d8  Bumped to groovy 2.5.11 CTR
     new f6a44cb  Merge branch '3.4-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 | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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

Posted by sp...@apache.org.

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

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

commit f6a44cb1fcdc2b70e5cad20ee1fe0c578bb4202a
Merge: cb49f6d 329f0d8
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Apr 17 07:05:43 2020 -0400

    Merge branch '3.4-dev'

 CHANGELOG.asciidoc | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --cc pom.xml
index c667218,b6ae9eb..ac19de1
--- a/pom.xml
+++ b/pom.xml
@@@ -146,10 -146,10 +146,10 @@@ limitations under the License
          <url>https://github.com/apache/tinkerpop</url>
      </scm>
      <properties>
 -        <commons.configuration.version>1.10</commons.configuration.version>
 +        <commons.configuration.version>2.6</commons.configuration.version>
          <commons.lang.version>2.6</commons.lang.version>
          <commons.lang3.version>3.8.1</commons.lang3.version>
-         <groovy.version>2.5.7</groovy.version>
+         <groovy.version>2.5.11</groovy.version>
          <hadoop.version>2.7.2</hadoop.version>
          <java.tuples.version>1.2</java.tuples.version>
          <javadoc-plugin.version>2.10.4</javadoc-plugin.version>