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 2017/03/09 18:01:27 UTC

[1/3] tinkerpop git commit: TINKERPOP-1645 Bump to groovy 2.4.9

Repository: tinkerpop
Updated Branches:
  refs/heads/master 9867a40e6 -> 1cd24031d


TINKERPOP-1645 Bump to groovy 2.4.9


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cde8b316
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cde8b316
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cde8b316

Branch: refs/heads/master
Commit: cde8b316e2cfdc7d8a7d1d3456d68d0f3a5d9828
Parents: 6a20df2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Mar 6 08:54:18 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Mar 6 08:54:18 2017 -0500

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cde8b316/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5d2184f..23f31f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@ limitations under the License.
     </scm>
     <properties>
         <commons.configuration.version>1.10</commons.configuration.version>
-        <groovy.version>2.4.8</groovy.version>
+        <groovy.version>2.4.9</groovy.version>
         <junit.version>4.12</junit.version>
         <metrics.version>3.0.2</metrics.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>


[2/3] tinkerpop git commit: Merge branch 'tp31' into tp32

Posted by sp...@apache.org.
Merge branch 'tp31' into tp32

Conflicts:
	pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9ea319d5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9ea319d5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9ea319d5

Branch: refs/heads/master
Commit: 9ea319d5d102432312f2044fc72e3668c1a8f7e2
Parents: 3fe223b cde8b31
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 9 13:01:03 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 9 13:01:03 2017 -0500

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ea319d5/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 09aeede,23f31f2..de8cf87
--- a/pom.xml
+++ b/pom.xml
@@@ -134,18 -127,9 +134,18 @@@ limitations under the License
      </scm>
      <properties>
          <commons.configuration.version>1.10</commons.configuration.version>
 +        <commons.lang.version>2.6</commons.lang.version>
 +        <commons.lang3.version>3.3.1</commons.lang3.version>
-         <groovy.version>2.4.8</groovy.version>
+         <groovy.version>2.4.9</groovy.version>
 -        <junit.version>4.12</junit.version>
 +        <hadoop.version>2.7.2</hadoop.version>
 +        <java.tuples.version>1.2</java.tuples.version>
 +        <javadoc-plugin.version>2.10.1</javadoc-plugin.version>
 +        <jcabi.version>1.1</jcabi.version>
          <metrics.version>3.0.2</metrics.version>
 +        <netty.version>4.0.42.Final</netty.version>
 +        <slf4j.version>1.7.21</slf4j.version>
 +        <snakeyaml.version>1.15</snakeyaml.version>
 +
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
          <skipIntegrationTests>true</skipIntegrationTests>


[3/3] tinkerpop git commit: Merge branch 'tp32'

Posted by sp...@apache.org.
Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1cd24031
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1cd24031
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1cd24031

Branch: refs/heads/master
Commit: 1cd24031d392ea8b00674e626573994632d8b337
Parents: 9867a40 9ea319d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Mar 9 13:01:14 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 9 13:01:14 2017 -0500

----------------------------------------------------------------------
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1cd24031/pom.xml
----------------------------------------------------------------------