You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by pl...@apache.org on 2016/06/08 05:12:01 UTC
[1/3] incubator-tinkerpop git commit: use mockito-core instead of
mockito-all to avoid hamcrest conflict
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/tp31 19c77916e -> 1f0c34fa6
use mockito-core instead of mockito-all to avoid hamcrest conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/27eedc47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/27eedc47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/27eedc47
Branch: refs/heads/tp31
Commit: 27eedc478b58cd9dee571960091a3c6505f2379e
Parents: 029f56b
Author: Jason Plurad <pl...@us.ibm.com>
Authored: Fri Jun 3 13:05:10 2016 -0400
Committer: Jason Plurad <pl...@us.ibm.com>
Committed: Fri Jun 3 13:05:10 2016 -0400
----------------------------------------------------------------------
gremlin-test/pom.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/27eedc47/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index f3de2ed..8686e6d 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -51,11 +51,23 @@ limitations under the License.
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>1.9.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
[2/3] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-1318'
into tp31
Posted by pl...@apache.org.
Merge branch 'TINKERPOP-1318' into tp31
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9f403aed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9f403aed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9f403aed
Branch: refs/heads/tp31
Commit: 9f403aed194633064e9f9d2ad96d768623a0583f
Parents: 19c7791 27eedc4
Author: Jason Plurad <pl...@us.ibm.com>
Authored: Wed Jun 8 00:45:49 2016 -0400
Committer: Jason Plurad <pl...@us.ibm.com>
Committed: Wed Jun 8 00:45:49 2016 -0400
----------------------------------------------------------------------
gremlin-test/pom.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] incubator-tinkerpop git commit: updated CHANGELOG
Posted by pl...@apache.org.
updated CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1f0c34fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1f0c34fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1f0c34fa
Branch: refs/heads/tp31
Commit: 1f0c34fa656a141db02104b55e4d73c1642086f7
Parents: 9f403ae
Author: Jason Plurad <pl...@us.ibm.com>
Authored: Wed Jun 8 01:11:30 2016 -0400
Committer: Jason Plurad <pl...@us.ibm.com>
Committed: Wed Jun 8 01:11:30 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1f0c34fa/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b6235e2..10f91a0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Avoid hamcrest conflict by using mockito-core instead of mockito-all dependency in `gremlin-test`.
* Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not hierarchical error for external graph implementations.
* Fixed a bug where timeout functions provided to the `GremlinExecutor` were not executing in the same thread as the script evaluation.
* Optimized a few special cases in `RangeByIsCountStrategy`.