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 2019/05/06 13:13:57 UTC
[tinkerpop] branch master updated (36abc7a8 -> f456339)
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 36abc7a8 Merge branch 'tp33'
add 734b7b2 Create uber jar for gremlin-console
new 5799ca5 Merge branch 'pr-1103' into uberjar
new 6caeb93 Generated an uberjar artifact for Gremlin Console
new f456339 Merge branch 'tp33'
The 3 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 +
docs/src/dev/developer/for-committers.asciidoc | 9 ++-
gremlin-console/pom.xml | 83 ++++++++++++++++++++++++++
3 files changed, 90 insertions(+), 3 deletions(-)
[tinkerpop] 02/03: Generated an uberjar artifact for Gremlin Console
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 6caeb93b0d8d73b6c060b997699a7c32053db8cd
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon May 6 09:06:45 2019 -0400
Generated an uberjar artifact for Gremlin Console
Fixed up license/notice stuff from PR #1103 CTR
---
CHANGELOG.asciidoc | 1 +
docs/src/dev/developer/for-committers.asciidoc | 9 +++--
gremlin-console/pom.xml | 56 ++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index db6748d..da2d017 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-3-7]]
=== TinkerPop 3.3.7 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Generated uberjar artifact for Gremlin Console.
* Improved folding of `property()` step into related mutating steps.
* Added `inject()` to steps generated on the DSL `TraversalSource`.
* Removed `gperfutils` dependencies from Gremlin Console.
diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc
index 3667b7a..da77743 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -615,15 +615,18 @@ that LICENSE in the root `/licenses` directory of the code repository.
=== Binary LICENSE and NOTICE
The binary LICENSE/NOTICE is perhaps most impacted by changes to the various `pom.xml` files. After altering the
-`pom.xml` file of any module, build both Gremlin Console and Gremlin Server and examine the contents of both binary
-distributions, either:
+`pom.xml` file of any module, build both Gremlin Console and Gremlin Server and examine the contents of the binary
+distributions:
+* target/gremlin-console-x.y.z-uber.jar
* target/apache-tinkerpop-gremlin-console-x.y.z-distribution.zip
* target/apache-tinkerpop-gremlin-server-x.y.z-distribution.zip
Apache licensed software does not need to be included in LICENSE, but if the new dependency is an Apache-approved
license (e.g. BSD, MIT) then it should be added in the pattern already defined. A copy of the LICENSE should be
-added to the `<project>/src/main/static/licenses` directory of the code repository.
+added to the `<project>/src/main/static/licenses` directory of the code repository and the `maven-shade-plugin` section
+of the `gremlin-console` `pom.xml` should be updated to reference this new license file so that it is included in the
+uber jar.
To determine if changes are required to the NOTICE, first check if the bundled jar has a NOTICE file in it (typically
found in `/META-INF` directory of the jar).
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 3d23ed2..2c7e49d 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -235,6 +235,62 @@ limitations under the License.
<shadedPattern>io.shaded.netty</shadedPattern>
</relocation>
</relocations>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"></transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+ <resources>
+ <resource>LICENSE.txt</resource>
+ <resource>LICENSE</resource>
+ <resource>NOTICE.txt</resource>
+ <resource>NOTICE</resource>
+ <resource>licenses</resource>
+ </resources>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/LICENSE</resource>
+ <file>src/main/static/LICENSE</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/NOTICE</resource>
+ <file>src/main/static/NOTICE</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/foundation</resource>
+ <file>src/main/static/licenses/foundation</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/jbcrypt</resource>
+ <file>src/main/static/licenses/jbcrypt</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/jcabi-log</resource>
+ <file>src/main/static/licenses/jcabi-log</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/jcabi-manifests</resource>
+ <file>src/main/static/licenses/jcabi-manifests</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/jline2</resource>
+ <file>src/main/static/licenses/jline2</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/kryo</resource>
+ <file>src/main/static/licenses/kryo</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/minlog</resource>
+ <file>src/main/static/licenses/minlog</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/normalize</resource>
+ <file>src/main/static/licenses/normalize</file>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>META-INF/licenses/slf4j</resource>
+ <file>src/main/static/licenses/slf4j</file>
+ </transformer>
+ </transformers>
</configuration>
</execution>
</executions>
[tinkerpop] 03/03: Merge branch 'tp33'
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 f4563398cf194c91bc1cf774fc249ac62eb9285e
Merge: 36abc7a8 6caeb93
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon May 6 09:08:22 2019 -0400
Merge branch 'tp33'
CHANGELOG.asciidoc | 1 +
docs/src/dev/developer/for-committers.asciidoc | 9 ++-
gremlin-console/pom.xml | 83 ++++++++++++++++++++++++++
3 files changed, 90 insertions(+), 3 deletions(-)
[tinkerpop] 01/03: Merge branch 'pr-1103' into uberjar
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 5799ca533a67e795c1f101d799ffe8a5428bc1bb
Merge: 6a25284 734b7b2
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon May 6 08:32:52 2019 -0400
Merge branch 'pr-1103' into uberjar
gremlin-console/pom.xml | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)