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/12/07 19:00:30 UTC
[tinkerpop] branch master updated (79b4d5b -> 546562e)
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 79b4d5b Merge branch '3.4-dev'
add a81195d TinkerPop 3.4.9 release
add 9b16261 Hide binary files that were showing up in source distribution CTR
new 546562e 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 | 59 ++++++++++++++++++++++++++++++++-
docs/src/upgrade/release-3.4.x.asciidoc | 2 +-
neo4j-gremlin/pom.xml | 2 +-
pom.xml | 8 ++++-
source-release.xml | 7 ++++
5 files changed, 74 insertions(+), 4 deletions(-)
[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 546562e293c6f7dcf36239ce5dfbf98dd1c03b64
Merge: 79b4d5b 9b16261
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Mon Dec 7 13:51:06 2020 -0500
Merge branch '3.4-dev'
CHANGELOG.asciidoc | 59 ++++++++++++++++++++++++++++++++-
docs/src/upgrade/release-3.4.x.asciidoc | 2 +-
neo4j-gremlin/pom.xml | 2 +-
pom.xml | 8 ++++-
source-release.xml | 7 ++++
5 files changed, 74 insertions(+), 4 deletions(-)
diff --cc neo4j-gremlin/pom.xml
index d9c959b,b294534..0accdea
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@@ -42,13 -42,6 +42,13 @@@ limitations under the License
<artifactId>gremlin-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- <!-- conflict from kirby -->
++ <!-- conflict from kirby -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --cc pom.xml
index 2710c2c,1692068..cafba10
--- a/pom.xml
+++ b/pom.xml
@@@ -732,11 -728,6 +738,11 @@@ limitations under the License
</exclusions>
</dependency>
<dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>2.4</version>
- </dependency>
++ </dependency>
+ <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${powermock.version}</version>