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/08/25 14:34:36 UTC
[17/50] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Merge remote-tracking branch 'origin/tp30'
Conflicts:
README.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/da57f391
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/da57f391
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/da57f391
Branch: refs/heads/tp30
Commit: da57f391905542345b92e52634dcd72dfc4cdcff
Parents: 856daac 5453b2d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 10 14:26:22 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 10 14:26:22 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
CONTRIBUTING.asciidoc | 131 ++++++++++++++++++-
README.asciidoc | 65 ++++-----
RELEASE.asciidoc | 93 +++++++++++++
.../step/sideEffect/GroovyGroupCountTest.groovy | 7 +-
.../step/sideEffect/GroupCountTest.java | 41 +++++-
6 files changed, 291 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/da57f391/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/da57f391/README.asciidoc
----------------------------------------------------------------------
diff --cc README.asciidoc
index 43529fa,934d5af..7299286
--- a/README.asciidoc
+++ b/README.asciidoc
@@@ -82,95 -54,13 +54,102 @@@ $ bin/gremlin.s
\,,,/
(o o)
-----oOOo-(3)-oOOo-----
- gremlin>
+ plugin activated: tinkerpop.server
+ plugin activated: tinkerpop.utilities
+ plugin activated: tinkerpop.tinkergraph
+ gremlin> graph = TinkerFactory.createModern()
+ ==>tinkergraph[vertices:6 edges:6]
+ gremlin> g = graph.traversal()
+ ==>graphtraversalsource[tinkergraph[vertices:6 edges:6], standard]
+ gremlin> g.V().has('name','vadas').valueMap()
+ ==>[name:[vadas], age:[27]]
----
+
+Issue Tracker Conventions
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+TinkerPop3 uses Apache JIRA as its link:https://issues.apache.org/jira/browse/TINKERPOP3[issue tracker]. JIRA is a very robust piece of software with many options and configurations. To simplify usage and ensure consistency across issues, the following conventions should be adhered to:
+
+* An issue's "status" should generally be in one of two states: `open` or `closed` (`reopened` is equivalent to `open` for our purposes).
+** An `open` issue is newly created, under consideration or otherwise in progress.
+** A `closed` issue is completed for purposes of release (i.e. code, testing, and documentation complete).
+** Issues in a `resolved` state should immediately be evaluated for movement to `closed` - issue become `resolved` by those who don't have the permissions to `close`.
+* An issue's "type" should be one of two options: `bug` or `improvement`.
+** A `bug` has a very specific meaning, referring to an error that prevents usage of TinkerPop AND does not have a reasonable workaround. Given that definition, a `bug` should generally have very high priority for a fix.
+** Everything else is an `improvement` in the sense that any other work is an enhancement to the current codebase.
+* The "component" should be representative of the primary area of code that it applies to and all issues should have this property set.
+* Issues are not assigned "labels".
+* The "affects/fix version(s)" fields should be appropriately set, where the "fix version" implies the version on which that particular issue will completed.
+
+Release Process
+~~~~~~~~~~~~~~~
+
+. `mvn clean install`
+.. `mvn verify -DskipIntegrationTests=false -DincludeNeo4j`
+.. `mvn verify -DskipPerformanceTests=false`
+. Perform manual tests:
+.. Execute `:remote connect conf/remote.yaml` and send some requests to a running Gremlin Server instance.
+.. Execute `:?` to display the help in the Console.
+. Update `CHANGELOG.asciidoc` with release date
+. `bin/bump.sh "version"` to update project files to reference the non-SNAPSHOT version
+. `git diff` and review the updated files (expect all `pom.xml` files and this README)
+. `git commit -a -m "TinkerPop x.y.z release"` and `git push`
+. `git tag -a -m "TinkerPop x.y.z release" x.y.z` and `git push --tags`
+. `mvn clean install -Dmaven.test.skip=true`
+. `bin/publish-docs.sh <username>`
+. `mvn install -Papache-release -DcreateChecksum=true -Dmaven.test.skip=true`
+. 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`
+.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-server/x.y.z/gremlin-server-x.y.z-distribution.zip* dev/x.y.z`
+.. `cp ~/.m2/repository/org/apache/tinkerpop/tinkerpop/x.y.z/tinkerpop-x.y.z-source-release.zip* dev/x.y.z`
+.. `cd dev/x.y.z` and `for f in *.zip*; do mv "$f" "apache-$f"; done`
+.. `cd ..; svn add x.y.z/; svn ci -m "TinkerPop x.y.z release"`
+. Submit for `[VOTE]` at `general@incubator.apache.org` (see email template below).
+. *Wait for vote acceptance* (72 hours).
+. `mvn clean install -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/])
+. `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\/\1-distribution\2 release\/x.y.z\/\1-bin\2/' -e 's/\(^[^ ]*\)-source-release\([^ ]*\)/cp dev\/x.y.z\/\1-source-release\2 release\/x.y.z\/\1-src\2/' | /bin/sh`
- . `cp dev/x.y.z/KEYS release/x.y.z/KEYS`
++. `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`
+. `cd release; svn add x.y.z/; svn ci -m "TinkerPop x.y.z release"`
+. Update homepage with references to latest distribution and to other internal links elsewhere on the page.
+. Wait for Apache Central to sync the jars and src (link:http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/[http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/]).
+. Announce release on `dev@`/`gremlin-users@` mailing lists and tweet from `@apachetinkerpop`.
+
+Example `[VOTE]` email:
+
+```
+[VOTE] TinkerPop x.y.z Release
+
+Hello,
+
+The release artifacts can be found at this location:
+ https://dist.apache.org/repos/dist/dev/incubator/tinkerpop/x.y.z/
+
+The source distribution is provided by:
+ apache-tinkerpop-x.y.z-source-release.zip
+
+Two binary distributions are provided for user convenience:
+ apache-gremlin-console-x.y.z-distribution.zip
+ apache-gremlin-server-x.y.z-distribution.zip
+
+The online docs can be found here:
+ http://tinkerpop.incubator.apache.org/docs/x.y.z/ (user docs)
+ http://tinkerpop.incubator.apache.org/javadocs/x.y.z/core/ (core javadoc)
+ http://tinkerpop.incubator.apache.org/javadocs/x.y.z/full/ (full javadoc)
+
+The tag in Apache Git can be found here:
+ https://git-wip-us.apache.org/repos/asf?p=incubator-tinkerpop.git;...
+
+The release notes are available here:
+ https://github.com/apache/incubator-tinkerpop/blob/master/CHANGELOG.asciidoc#...
+
+The [VOTE] will be open for the next 72 hours --- closing <DayOfTheWeek> (<Month> <Day> <Year>) at <Time> <TimeZone>.
+
+My vote is +1.
+
+Thank you very much,
+<TinkerPop Committer Name>
+```