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 2015/09/16 19:43:58 UTC
[1/5] incubator-tinkerpop git commit: Remove "permissive licensed"
dependencies from binary NOTICE.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master c3553f740 -> cf6c455bb
Remove "permissive licensed" dependencies from binary NOTICE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/55f5a3c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/55f5a3c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/55f5a3c6
Branch: refs/heads/master
Commit: 55f5a3c6227504168e7b5fc05d9c89fe1e0b11de
Parents: e4010c1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 15 09:26:20 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 15 09:26:20 2015 -0400
----------------------------------------------------------------------
gremlin-console/src/main/NOTICE | 29 -----------------------------
gremlin-server/src/main/NOTICE | 35 -----------------------------------
2 files changed, 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/55f5a3c6/gremlin-console/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/NOTICE b/gremlin-console/src/main/NOTICE
index 9900dd7..2c4ad6d 100644
--- a/gremlin-console/src/main/NOTICE
+++ b/gremlin-console/src/main/NOTICE
@@ -162,35 +162,6 @@ Portions of this software were originally based on the following:
- software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
------------------------------------------------------------------------
-jcabi-log
-------------------------------------------------------------------------
-Copyright (c) 2012-2014, jcabi.com
-All rights reserved.
-
-------------------------------------------------------------------------
-jcabi-manifests
-------------------------------------------------------------------------
-Copyright (c) 2012-2015, jcabi.com
-All rights reserved.
-
-------------------------------------------------------------------------
-JLine
-------------------------------------------------------------------------
-Copyright (c) 2002-2012, the original author or authors.
-All rights reserved.
-
-------------------------------------------------------------------------
-SLF4j
-------------------------------------------------------------------------
-Copyright (c) 2004-2007 QOS.ch
-All rights reserved.
-
-------------------------------------------------------------------------
-jBCrypt
-------------------------------------------------------------------------
-Copyright (c) 2006 Damien Miller <dj...@mindrot.org>
-
-------------------------------------------------------------------------
Xerces
------------------------------------------------------------------------
Apache Xerces Java
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/55f5a3c6/gremlin-server/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/NOTICE b/gremlin-server/src/main/NOTICE
index 4ad5e46..3bbd15b 100644
--- a/gremlin-server/src/main/NOTICE
+++ b/gremlin-server/src/main/NOTICE
@@ -111,41 +111,6 @@ LongAdder), which was released with the following comments:
http://creativecommons.org/publicdomain/zero/1.0/
------------------------------------------------------------------------
-jBCrypt
-------------------------------------------------------------------------
-Copyright (c) 2006 Damien Miller <dj...@mindrot.org>
-
-------------------------------------------------------------------------
-jcabi-log
-------------------------------------------------------------------------
-Copyright (c) 2012-2014, jcabi.com
-All rights reserved.
-
-------------------------------------------------------------------------
-jcabi-manifests
-------------------------------------------------------------------------
-Copyright (c) 2012-2015, jcabi.com
-All rights reserved.
-
-------------------------------------------------------------------------
-JLine
-------------------------------------------------------------------------
-Copyright (c) 2002-2012, the original author or authors.
-All rights reserved.
-
-------------------------------------------------------------------------
-gmetric4j
-------------------------------------------------------------------------
-Copyright (C) 2010-2015 Daniel Pocock <da...@pocock.com.au>
-Copyright (c) 2008-2011 Jasper Humphrey <ja...@gmail.com>
-
-------------------------------------------------------------------------
-SLF4j
-------------------------------------------------------------------------
-Copyright (c) 2004-2007 QOS.ch
-All rights reserved.
-
-------------------------------------------------------------------------
Netty
------------------------------------------------------------------------
Netty/All-in-One (io.netty:netty-all - http://netty.io/netty-all/)
[3/5] incubator-tinkerpop git commit: Removed unecessary bits from
Apache dependencies in binary NOTICE.
Posted by sp...@apache.org.
Removed unecessary bits from Apache dependencies in binary NOTICE.
Given http://www.apache.org/dev/licensing-howto.html#bundle-asf-product
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/d0ac365f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/d0ac365f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/d0ac365f
Branch: refs/heads/master
Commit: d0ac365f0710b79ecfa48386fc944faf84ad11d5
Parents: 588958c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 15 10:25:01 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 15 10:25:01 2015 -0400
----------------------------------------------------------------------
gremlin-console/src/main/NOTICE | 30 ------------------------------
gremlin-server/src/main/NOTICE | 21 +--------------------
2 files changed, 1 insertion(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d0ac365f/gremlin-console/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/NOTICE b/gremlin-console/src/main/NOTICE
index 9681f4f..1d43a02 100644
--- a/gremlin-console/src/main/NOTICE
+++ b/gremlin-console/src/main/NOTICE
@@ -24,18 +24,12 @@ commons-beanutils
Apache Commons BeanUtils
Copyright 2000-2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------
commons-codec
------------------------------------------------------------------------
Apache Commons Codec
Copyright 2002-2015 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
contains test data from http://aspell.net/test/orig/batch0.tab.
Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
@@ -54,27 +48,18 @@ Commons Collections
Apache Commons Collections
Copyright 2001-2015 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------
Commons Configuration
------------------------------------------------------------------------
Apache Commons Configuration
Copyright 2001-2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------
Commons Lang
------------------------------------------------------------------------
Apache Commons Lang
Copyright 2001-2015 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
@@ -84,9 +69,6 @@ Commons Logging
Apache Commons Logging
Copyright 2003-2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------
Groovy
------------------------------------------------------------------------
@@ -109,18 +91,12 @@ Http Components Client
Apache HttpComponents Client
Copyright 1999-2015 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------
Http Components Core
------------------------------------------------------------------------
Apache HttpComponents Core
Copyright 2005-2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
This project contains annotations derived from JCIP-ANNOTATIONS
Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
@@ -158,9 +134,6 @@ XML Commons
Apache XML Commons XML APIs
Copyright 1999-2014 The Apache Software Foundation.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of this software were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
- software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
@@ -172,9 +145,6 @@ Xerces
Apache Xerces Java
Copyright 1999-2006 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of Apache Xerces Java in xercesImpl.jar and xml-apis.jar
were originally based on the following:
- software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d0ac365f/gremlin-server/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/NOTICE b/gremlin-server/src/main/NOTICE
index a227d6d..8209708 100644
--- a/gremlin-server/src/main/NOTICE
+++ b/gremlin-server/src/main/NOTICE
@@ -24,27 +24,18 @@ Commons Collections
Apache Commons Collections
Copyright 2001-2015 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------
Commons Configuration
------------------------------------------------------------------------
Apache Commons Configuration
Copyright 2001-2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------
Commons Lang
------------------------------------------------------------------------
Apache Commons Lang
Copyright 2001-2015 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
@@ -54,9 +45,6 @@ Commons Logging
Apache Commons Logging
Copyright 2003-2014 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------
Groovy
------------------------------------------------------------------------
@@ -93,9 +81,6 @@ limitations under the License.
------------------------------------------------------------------------
Log4j
------------------------------------------------------------------------
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
This product includes source code based on Sun
Microsystems' book titled "Java Nativer Interface:
Programmer's Guide and Specification" and freely available
@@ -322,8 +307,4 @@ Netty/All-in-One (io.netty:netty-all - http://netty.io/netty-all/)
* LICENSE:
* license/LICENSE.aalto-xml.txt (Apache License 2.0)
* HOMEPAGE:
- * http://wiki.fasterxml.com/AaltoHome
-
-
-
-
+ * http://wiki.fasterxml.com/AaltoHome
\ No newline at end of file
[5/5] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp30'
Conflicts:
gremlin-console/src/main/NOTICE
gremlin-server/src/main/NOTICE
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cf6c455b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cf6c455b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cf6c455b
Branch: refs/heads/master
Commit: cf6c455bb3a0c7ebedb1cc6d4d6c89b3010f6357
Parents: c3553f7 961388e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 16 13:43:19 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 16 13:43:19 2015 -0400
----------------------------------------------------------------------
RELEASE.asciidoc | 5 ++-
gremlin-console/src/main/NOTICE | 76 +++---------------------------------
gremlin-server/src/main/NOTICE | 73 +++-------------------------------
3 files changed, 14 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
[4/5] incubator-tinkerpop git commit: Update release instructions.
Posted by sp...@apache.org.
Update release instructions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/961388e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/961388e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/961388e5
Branch: refs/heads/master
Commit: 961388e592a39d9c16c194534d68506bb959bfcb
Parents: d0ac365
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 16 13:26:06 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 16 13:26:06 2015 -0400
----------------------------------------------------------------------
RELEASE.asciidoc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/961388e5/RELEASE.asciidoc
----------------------------------------------------------------------
diff --git a/RELEASE.asciidoc b/RELEASE.asciidoc
index 4044be0..2947d2b 100644
--- a/RELEASE.asciidoc
+++ b/RELEASE.asciidoc
@@ -65,6 +65,7 @@ A positive vote for a particular release from the TinkerPop PMC is required to m
. `mvn clean install -Dmaven.test.skip=true`
. `bin/publish-docs.sh <username>`
. `mvn install -Papache-release -DcreateChecksum=true -Dmaven.test.skip=true`
+. Review generated artifacts to be sure they have both javadocs and asciidocs present
. Upload artifacts to `https://dist.apache.org/repos/dist/dev/incubator/tinkerpop` for `[VOTE]` review.
.. `svn co --depth empty https://dist.apache.org/repos/dist/dev/incubator/tinkerpop/ dev` and `mkdir dev/x.y.z`
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-console/x.y.z/gremlin-console-x.y.z-distribution.zip* dev/x.y.z`
@@ -91,9 +92,9 @@ A positive vote for a particular release from the Apache Incubator is required t
Release & Promote
~~~~~~~~~~~~~~~~~
-. `mvn clean install -Dmaven.test.skip=true; bin/process-docs.sh` - rebuild source and docs of tagged release
+. `mvn clean install -Djavadoc -Dmaven.test.skip=true; bin/process-docs.sh` - rebuild source and docs of tagged release
. `mvn deploy -Papache-release -DcreateChecksum=true -Dmaven.test.skip=true`- deploy signed artifacts with checksums to Apache Nexus
-. Review and close the staging repository (Apache Nexus at link:https://repository.apache.org/[https://repository.apache.org/])
+. Review and close the staging repository (Apache Nexus at link:https://repository.apache.org/[https://repository.apache.org/]) - check that versions are correct and that all artifacts are present
. `svn co --depth empty https://dist.apache.org/repos/dist/dev/incubator/tinkerpop dev; svn up dev/x.y.z`
. `svn co --depth empty https://dist.apache.org/repos/dist/release/incubator/tinkerpop release; mkdir release/x.y.z`
. `ls dev/x.y.z/ | grep '\-\(distribution\|source\-release\)\.zip' | sed -e 's/\(^[^ ]*\)-distribution\([^ ]*\)/cp dev\/x.y.z\/\0 release\/x.y.z\/\1-bin\2/' -e 's/\(^[^ ]*\)-source-release\([^ ]*\)/cp dev\/x.y.z\/\0 release\/x.y.z\/\1-src\2/' | /bin/sh`
[2/5] incubator-tinkerpop git commit: Add HPPC copyright to NOTICE.
Posted by sp...@apache.org.
Add HPPC copyright to NOTICE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/588958c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/588958c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/588958c5
Branch: refs/heads/master
Commit: 588958c5e099cf98fa1e7cdee52e73bf76832e39
Parents: 55f5a3c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 15 09:32:27 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 15 09:32:27 2015 -0400
----------------------------------------------------------------------
gremlin-console/src/main/NOTICE | 5 +++++
gremlin-server/src/main/NOTICE | 5 +++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/588958c5/gremlin-console/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/NOTICE b/gremlin-console/src/main/NOTICE
index 2c4ad6d..9681f4f 100644
--- a/gremlin-console/src/main/NOTICE
+++ b/gremlin-console/src/main/NOTICE
@@ -99,6 +99,11 @@ This product includes software developed by
The Groovy community (http://groovy.codehaus.org/).
------------------------------------------------------------------------
+HPPC: High Performance Primitive Collections
+------------------------------------------------------------------------
+(c) Carrot Search s.c., http://carrotsearch.com/
+
+------------------------------------------------------------------------
Http Components Client
------------------------------------------------------------------------
Apache HttpComponents Client
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/588958c5/gremlin-server/src/main/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/NOTICE b/gremlin-server/src/main/NOTICE
index 3bbd15b..a227d6d 100644
--- a/gremlin-server/src/main/NOTICE
+++ b/gremlin-server/src/main/NOTICE
@@ -69,6 +69,11 @@ This product includes software developed by
The Groovy community (http://groovy.codehaus.org/).
------------------------------------------------------------------------
+HPPC: High Performance Primitive Collections
+------------------------------------------------------------------------
+(c) Carrot Search s.c., http://carrotsearch.com/
+
+------------------------------------------------------------------------
Java Tuples
------------------------------------------------------------------------
Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)