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 2021/04/15 10:56:18 UTC
[tinkerpop] branch master updated: Excluded groovy from shade
driver jar.
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
The following commit(s) were added to refs/heads/master by this push:
new 36c4244 Excluded groovy from shade driver jar.
36c4244 is described below
commit 36c4244e8c17a00b0dbb4cda1acb5bf8fa2f26ac
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Apr 15 06:53:15 2021 -0400
Excluded groovy from shade driver jar.
Not sure how this was missed before. Groovy is only there for the json serialization and is an optional dependency. Really don't want optionals in there except for TinkerGraph. Fixed up documentation a bit around this. CTR
---
docs/src/reference/gremlin-variants.asciidoc | 2 +-
docs/src/upgrade/release-3.5.x.asciidoc | 7 ++++---
gremlin-driver/pom.xml | 3 +++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index 347da4e..d8a140c 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -99,7 +99,7 @@ connection methods described in the <<connecting-gremlin,Connecting Gremlin>> Se
</dependency>
<!--
-alternatively the driver is packaged as an uberjar with shaded dependencies including gremlin-core and
+alternatively the driver is packaged as an uberjar with shaded non-optional dependencies including gremlin-core and
tinkergraph-gremlin which are not shaded.
-->
<dependency>
diff --git a/docs/src/upgrade/release-3.5.x.asciidoc b/docs/src/upgrade/release-3.5.x.asciidoc
index 0cb215d..abeae0e 100644
--- a/docs/src/upgrade/release-3.5.x.asciidoc
+++ b/docs/src/upgrade/release-3.5.x.asciidoc
@@ -53,7 +53,7 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-2335[TINKERPOP-2335]
The `gremlin-driver` has an additional packaging which may make it easier to upgrade for some users who may have
extensive dependency chains.
-[source,xml}
+[source,xml]
----
<dependency>
<groupId>org.apache.tinkerpop</groupId>
@@ -63,8 +63,9 @@ extensive dependency chains.
</dependency>
----
-The above dependency with the `shaded` classifier shades all the dependencies of `gremlin-driver` and includes
-`gremlin-core` and `tinkergraph-gremlin` in an unshaded form.
+The above dependency with the `shaded` classifier shades all the non-optional dependencies of `gremlin-driver` and
+includes `gremlin-core` and `tinkergraph-gremlin` in an unshaded form. The slf4j dependency was not included because
+shading it can cause problems with its operations.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-2476[TINKERPOP-2476]
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 9bc1186..4f0b759 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -167,11 +167,14 @@ limitations under the License.
<shadedClassifierName>shaded</shadedClassifierName>
<artifactSet>
<!-- exclude logging stuff from uberjar - shading prevents proper logger initialization -->
+ <!-- exclude groovy as it's only needed for json serialization and is an optional dependency -->
<excludes>
<exclude>log4j:log4j</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:jcl-over-slf4j</exclude>
+ <exclude>org.codehaus.groovy:groovy</exclude>
+ <exclude>org.codehaus.groovy:groovy-json</exclude>
</excludes>
</artifactSet>
<relocations>