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 2016/09/12 11:07:30 UTC

[01/13] tinkerpop git commit: Update release documentation.

Repository: tinkerpop
Updated Branches:
  refs/heads/master 014232423 -> 4cabb9d11


Update release documentation.

Provided some more clarity on some of the release steps. CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b8ecebec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b8ecebec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b8ecebec

Branch: refs/heads/master
Commit: b8ecebecd539102dd3cf0209a188f17ca12e3966
Parents: 16057b1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 9 08:37:55 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 9 08:37:55 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/developer/release.asciidoc | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8ecebec/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 8b16e2d..ae1f246 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -94,34 +94,36 @@ are additional tests to perform that the release manager feels are relevant, the
 words, there is no need to rebuild the `SNAPSHOT` yet another time unless there are circumstances that would call its
 validity into question.
 . Update `CHANGELOG.asciidoc`:
-.. Update the release date
+.. Update the release date - the release date is the date of the vote.
 .. Generate the JIRA release notes report for the current version and append them to the `CHANGELOG.asciidoc`.
 ... Use an "advanced" search to filter out JIRA issues already released on other versions. For example: `fixVersion
-= 3.2.0 AND fixVersion not in (3.1.3, 3.1.2, 3.1.1, 3.1.0)`.
-... Consider use of an "Excel" export to organize, sort (by type and then id) and prepare the JIRA tickets to be pasted to `CHANGELOG.asciidoc`
+= 3.2.0 AND fixVersion not in (3.1.3, 3.1.2, 3.1.1, 3.1.0) ORDER BY type, Id ASC`.
+... Consider use of an "Excel" export to organize and prepare the JIRA tickets to be pasted to `CHANGELOG.asciidoc`
 ... Be sure to include a link to other versions in the `CHANGELOG.asciidoc` that were previously released while the
 current release was under development as this new release will have those changes included within it. Please see
 3.2.1 for an example.
 .. Organize "breaking" changes to be clearly marked (use JIRA and the "breaking" label to identify those)
 . Update "upgrade documentation":
 .. Update the release date.
-.. Update the link to CHANGELOG.asciidoc
+.. Update the link to `CHANGELOG.asciidoc` - this link may already be correct but will not exist until the repository is tagged.
 . `mvn versions:set -DnewVersion=xx.yy.zz -DgenerateBackupPoms=false` 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 xx.yy.zz release"` and push
 . `mvn clean install` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
 . `bin/process-docs.sh` and validate the generated documentation locally (don't rely on "SUCCESS" - scroll up through logs to ensure there were no errors and view the HTML directly)
-. `bin/publish-docs.sh <username>` - Note that this step requires no additional processing as the previous step.
-handled document generation and this step now merely needs to upload what was generated.
-. `mvn deploy -Papache-release -DcreateChecksum=true -DskipTests` - deploy signed artifacts with checksums to link:https://repository.apache.org/[Apache Nexus]. Review (artifacts versions, file sizes, anything that might be out of place - request another committer to review as well).
-. Review generated artifacts to be sure they have both javadocs and asciidocs present then "close" the repo - if the repo is left open it will be automatically dropped after five days and closing the repo will allow it to stay available for a full ninety days which is more than enough time to complete a vote. Do NOT "release" the repository at this time.
-. Upload artifacts to `https://dist.apache.org/repos/dist/dev//tinkerpop` for `[VOTE]` review.
-.. `svn co --depth empty https://dist.apache.org/repos/dist/dev//tinkerpop/ dev` and `mkdir dev/xx.yy.zz`
+. `bin/publish-docs.sh <username>` - Note that this step requires no additional processing as the previous step handled
+document generation and this step now merely needs to upload what was generated. Note that this step will be responsible
+for generating javadoc and without that the binary distributions won't contain that documentation.
+. `mvn deploy -Papache-release -DcreateChecksum=true -DskipTests` - deploy signed artifacts with checksums to link:https://repository.apache.org/[Apache Nexus].
+. Review generated artifacts to be sure they have both javadocs and asciidocs present (request another committer to review as well) then "close" the repo - if the repo is left open it will be automatically dropped after five days and closing the repo will allow it to stay available for a full ninety days which is more than enough time to complete a vote. Do NOT "release" the repository at this time.
+. Upload artifacts to `https://dist.apache.org/repos/dist/dev/tinkerpop` for `[VOTE]` review.
+.. Use `svn rm` to delete past versions that were up for review in the same line of code. In other words, if uploading 3.2.3 then remove instances of 3.2.2 or any other past 3.2.x releases.
+.. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop/ dev` and `mkdir dev/xx.yy.zz`
 .. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-console/xx.yy.zz/gremlin-console-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
 .. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-server/xx.yy.zz/gremlin-server-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
 .. `cp ~/.m2/repository/org/apache/tinkerpop/tinkerpop/xx.yy.zz/tinkerpop-xx.yy.zz-source-release.zip* dev/xx.yy.zz`
 .. `cd dev/xx.yy.zz`
-.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-tinkerpop-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
+.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-tinkerpop-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e 's/tinkerpop-tinkerpop/tinkerpop/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
 .. `cd ..; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
 . Execute `bin/validate-distribution.sh` and any other relevant testing.
 . `git tag -a -m "TinkerPop xx.yy.zz release" xx.yy.zz` and `git push --tags`
@@ -181,7 +183,7 @@ The GPG key used to sign the release artifacts is available at:
     https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS
 
 The online docs can be found here:
-	http://tinkerpop.apache.org/docs/xx.yy.zz/reference/ (user docs)
+	http://tinkerpop.apache.org/docs/xx.yy.zz/ (user docs)
 	http://tinkerpop.apache.org/docs/xx.yy.zz/upgrade/ (upgrade docs)
 	http://tinkerpop.apache.org/javadocs/xx.yy.zz/core/ (core javadoc)
 	http://tinkerpop.apache.org/javadocs/xx.yy.zz/full/ (full javadoc)


[13/13] tinkerpop git commit: Merge remote-tracking branch 'origin/master'

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4cabb9d1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4cabb9d1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4cabb9d1

Branch: refs/heads/master
Commit: 4cabb9d118debb9e37207e57da763275891cedcf
Parents: 72ebad2 0142324
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 07:07:19 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 07:07:19 2016 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[06/13] tinkerpop git commit: Bumping to 3.1.5-SNAPSHOT

Posted by sp...@apache.org.
Bumping to 3.1.5-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0b7da662
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0b7da662
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0b7da662

Branch: refs/heads/master
Commit: 0b7da662b464a788c2a80b4971b7241a3c6af41b
Parents: 16057b1
Author: Ted Wilmes <tw...@gmail.com>
Authored: Sun Sep 11 16:37:19 2016 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Sun Sep 11 16:37:19 2016 -0500

----------------------------------------------------------------------
 giraph-gremlin/pom.xml                                  | 2 +-
 gremlin-archetype/gremlin-archetype-server/pom.xml      | 2 +-
 gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml | 2 +-
 gremlin-archetype/pom.xml                               | 2 +-
 gremlin-console/pom.xml                                 | 2 +-
 gremlin-core/pom.xml                                    | 2 +-
 gremlin-driver/pom.xml                                  | 2 +-
 gremlin-groovy-test/pom.xml                             | 2 +-
 gremlin-groovy/pom.xml                                  | 2 +-
 gremlin-server/pom.xml                                  | 2 +-
 gremlin-shaded/pom.xml                                  | 2 +-
 gremlin-test/pom.xml                                    | 2 +-
 hadoop-gremlin/pom.xml                                  | 2 +-
 neo4j-gremlin/pom.xml                                   | 2 +-
 pom.xml                                                 | 2 +-
 spark-gremlin/pom.xml                                   | 2 +-
 tinkergraph-gremlin/pom.xml                             | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 2257e35..9bbb781 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>giraph-gremlin</artifactId>
     <name>Apache TinkerPop :: Giraph Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index 18624b9..9d43651 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-archetype-server</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index 71f4f94..14a6143 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-archetype-tinkergraph</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 5e7222b..eab73f1 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
 
     <artifactId>gremlin-archetype</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index eeeb46e..4b5cbde 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-console</artifactId>
     <name>Apache TinkerPop :: Gremlin Console</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 5823f38..4d4b767 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-core</artifactId>
     <name>Apache TinkerPop :: Gremlin Core</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 55c51d2..3b38ab7 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-driver</artifactId>
     <name>Apache TinkerPop :: Gremlin Driver</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index c31d583..90dcd98 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-groovy-test</artifactId>
     <name>Apache TinkerPop :: Gremlin Groovy Test</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 04acfbb..3de8465 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-groovy</artifactId>
     <name>Apache TinkerPop :: Gremlin Groovy</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 2b61071..a26f2d0 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-server</artifactId>
     <name>Apache TinkerPop :: Gremlin Server</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index 8e2338e..c52a972 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-shaded</artifactId>
     <name>Apache TinkerPop :: Gremlin Shaded</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index bb81570..17307cf 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>gremlin-test</artifactId>
     <name>Apache TinkerPop :: Gremlin Test</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 254b9f0..07da174 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>hadoop-gremlin</artifactId>
     <name>Apache TinkerPop :: Hadoop Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 55245c3..dfdffe3 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>neo4j-gremlin</artifactId>
     <name>Apache TinkerPop :: Neo4j Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2077a50..4d0c782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     </parent>
     <groupId>org.apache.tinkerpop</groupId>
     <artifactId>tinkerpop</artifactId>
-    <version>3.1.4</version>
+    <version>3.1.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Apache TinkerPop</name>
     <description>A Graph Computing Framework</description>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 833e9a5..b5797cb 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>spark-gremlin</artifactId>
     <name>Apache TinkerPop :: Spark Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b7da662/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index bf60408..8b85b12 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.4</version>
+        <version>3.1.5-SNAPSHOT</version>
     </parent>
     <artifactId>tinkergraph-gremlin</artifactId>
     <name>Apache TinkerPop :: TinkerGraph Gremlin</name>


[10/13] tinkerpop git commit: Update upgrade docs for 3.1.5 CTR

Posted by sp...@apache.org.
Update upgrade docs for 3.1.5 CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/23abbe1e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/23abbe1e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/23abbe1e

Branch: refs/heads/master
Commit: 23abbe1ed58ee3a553da86fa4c2d02a494ba0813
Parents: 239a10a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 06:47:27 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 06:47:27 2016 -0400

----------------------------------------------------------------------
 docs/src/upgrade/release-3.1.x-incubating.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23abbe1e/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.1.x-incubating.asciidoc b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
index 154c344..400ea10 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -22,7 +22,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 *A 187 On The Undercover Gremlinz*
 
-TinkerPop 3.1.4
+TinkerPop 3.1.5
 ---------------
 
 *Release Date: NOT OFFICIALLY RELEASED YET*


[02/13] tinkerpop git commit: Get rid of PPMC references

Posted by sp...@apache.org.
Get rid of PPMC references

Not sure why this only occurred on master CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0181d818
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0181d818
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0181d818

Branch: refs/heads/master
Commit: 0181d8186214cdbfec6dfcaff6f8060ced6d0325
Parents: b8ecebe
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 9 09:15:34 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 9 09:15:34 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/developer/administration.asciidoc | 107 ++++++++++++++------
 1 file changed, 78 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0181d818/docs/src/dev/developer/administration.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/administration.asciidoc b/docs/src/dev/developer/administration.asciidoc
index e1eb352..80e1b24 100644
--- a/docs/src/dev/developer/administration.asciidoc
+++ b/docs/src/dev/developer/administration.asciidoc
@@ -20,8 +20,8 @@ Administration
 New Committers
 --------------
 
-When a candidate is identified by a PPMC member as someone who might be a good official committer to TinkerPop, the
-PPMC member should open a DISCUSS thread on the private TinkerPop mailing list.  The thread should provide some
+When a candidate is identified by a PMC member as someone who might be a good official committer to TinkerPop, the
+PMC member should open a DISCUSS thread on the private TinkerPop mailing list.  The thread should provide some
 background and reasoning for why that member believes the candidate would be a good committer.  Given enough time for
 feedback on the candidate and presuming there is still positive interest in doing so, a VOTE thread on the private
 TinkerPop mailing list is started to get the official stance.  As per usual, the VOTE will be made open for no less
@@ -36,52 +36,101 @@ SUBJECT: Invitation to become TinkerPop committer: [candidate name]
 
 Hello,
 
-The TinkerPop Podling Project Management Committee (PPMC)  hereby offers you committer privileges to the project.
-These privileges are offered on the understanding that you'll use them reasonably and with common sense. We like to
-work on trust rather than unnecessary constraints.
+The TinkerPop Project Management Committee (PMC) hereby offers you committer
+privileges to the project. These privileges are offered on the understanding
+that you'll use them reasonably and with common sense. We like to work on
+trust rather than unnecessary constraints.
 
-Being a committer enables you to more easily make changes without needing to go through the patch submission process.
+Being a committer enables you to more easily make changes without needing to
+go through the patch submission process.
 
-Being a committer does not require you to participate any more than you already do. It does tend to make one even more
-committed.  You will probably find that you spend more time here.
+Being a committer does not require you to participate any more than you already
+do. It does tend to make one even more committed.  You will probably find that
+you spend more time here.
 
-Of course, you can decline and instead remain as a contributor, participating as you do now.
+Of course, you can decline and instead remain as a contributor, participating
+as you do now.
 
-A. This personal invitation is a chance for you to accept or decline in private.  Either way, please let us know in
-reply to the private@tinkerpop.apache.org address only.
+A. This personal invitation is a chance for you to accept or decline in
+private.  Either way, please let us know in reply to the
+private@tinkerpop.apache.org address only.
 
-B. If you are accepting, the next step is to register an iCLA with the Apache Software Foundation:
-    1. Details of the iCLA and the forms are found through this link: http://www.apache.org/licenses/#clas.
+B. If you are accepting, the next step is to register an iCLA with the Apache
+Software Foundation:
+  1. Details of the iCLA and the forms are found through this link:
+     http://www.apache.org/licenses/#clas.
 
-    2. The form (text or PDF version) provides instructions for its completion and return to the Secretary of the ASF
-       at secretary@apache.org.
+  2. The form (text or PDF version) provides instructions for its completion
+     and return to the Secretary of the ASF at secretary@apache.org.
 
-    3. When you transmit the completed iCLA, request to notify Apache TinkerPop and choose a unique Apache id.
-       Look to see if your preferred id is already taken at http://people.apache.org/committer-index.html   This will
-       allow the Secretary to notify the PMC when your iCLA has been recorded.
+  3. When you complete iCLA ensure that you include "Apache TinkerPop" in the
+     "notify project" project field and choose a preferred unique Apache id.
+     Look to see if your preferred id is already taken at
+     http://people.apache.org/committer-index.html. This will allow the
+     Secretary to notify the PMC when your iCLA has been recorded.
 
-When recording of your iCLA is noticed, you will receive a follow-up message with the next steps for establishing you
-as a committer.
+When recording of your iCLA is noticed, you will receive a follow-up message
+with the next steps for establishing you as a committer.
 ----
 
-Assuming the individual accepts, the next step is to get their account created.  As we are in incubation, we will
-need to contact a mentor for help with this step.
+Assuming the iCLA included items from step 3, the secretary will handle account creation, otherwise it will be up to
+the PMC chair to link:http://www.apache.org/dev/pmc.html#newcommitter[handle such things]. Once the account is
+established the PMC chair will then need to:
 
-Upon confirming with the new committer that their account is established, send an announcement email to the
-developer and user mailing lists:
+. Validate that the iCLA is on file either through link:https://svn.apache.org/repos/private/foundation/officers/[svn]
+or through link:http://people.apache.org/committer-index.html[people.apache.org].
+. Request that the account be created. The PMC Chair may do this through the link:http://infra.apache.org/[Account Request Form].
+. Once verified, provide the new committer access to the repository, which is most easily done through
+link:https://whimsy.apache.org/roster/committee/[Whimsy].
+. Send an announcement email to the developer and user mailing lists with the template below.
 
 [source,text]
 ----
 SUBJECT: New Committer: [committer name]
 
-The Podling Project Management Committee (PPMC) for Apache TinkerPop has asked [committer name] to become a committer
-and we are pleased to announce that he has accepted.
+The Project Management Committee (PMC) for Apache TinkerPop has asked
+[committer name] to become a committer and we are pleased to announce their
+acceptance.
 
-[describe the nature of the committers work in the community]
+[describe the nature of the committer's work in the community]
 
-Being a committer enables easier contribution to the project since there is no need to work via the patch submission
-process. This should enable better productivity.
+Being a committer enables easier contribution to the project since there is no
+need to work via the patch submission process. This should enable better
+productivity.
 ----
 
+Finally, new committers should be sent an email that covers some of the administrative elements of their new role:
+
+* link:http://www.apache.org/dev/committers.html[Apache Committer Guide]
+* link:http://www.apache.org/dev/committers.html[Apache Committer FAQ]
+* link:http://tinkerpop.apache.org/docs/current/dev/developer/[TinkerPop Developer Documentation]
+** Bring specific attention to the "committer" section which describes our general policies.
+
+New PMC Members
+---------------
+
+The process for bringing on new PMC members is not so different from the one for new committers. The process begins
+with a DISCUSS thread to the private mailing list for building consensus followed by a VOTE thread to confirm.
+Presuming the new PMC member is a committer already (which is mostly likely for TinkerPop), there should be no need for
+any additional paperwork. On successful vote however, a NOTICE should be sent to the board@apache.org (copying
+private@tinkerpop.apache.org):
+
+[source,text]
+----
+Subject [NOTICE] [name of PMC new member] for Apache TinkerPop PMC
+
+Apache TinkerPop proposes to invite [name of PMC new member] ([ApacheId]) to join the PMC.
+
+The vote result is available here:
+
+[include the link to the vote result thread from private]
+----
+
+If the candidate does not (yet) have an Apache account, then please note that fact in the notification email. Provide
+the board 72 hours to respond with objection before extending the invite to the new PMC member. Once that time has
+elapsed, the invite may be sent to the new PMC member. If they accept, then the PMC chair should refer to the
+link:http://www.apache.org/dev/pmc.html#newpmc[How to Add a New PMC Member] section in the Apache docs for ho to
+complete the process. Use link:https://whimsy.apache.org/roster/committee/[Whimsy] to update PMC membership.
+
 
 


[12/13] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'

Conflicts:
	docs/src/dev/developer/administration.asciidoc
	giraph-gremlin/pom.xml
	gremlin-archetype/gremlin-archetype-server/pom.xml
	gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
	gremlin-archetype/pom.xml
	gremlin-console/pom.xml
	gremlin-core/pom.xml
	gremlin-driver/pom.xml
	gremlin-groovy-test/pom.xml
	gremlin-groovy/pom.xml
	gremlin-server/pom.xml
	gremlin-shaded/pom.xml
	gremlin-test/pom.xml
	hadoop-gremlin/pom.xml
	neo4j-gremlin/pom.xml
	pom.xml
	spark-gremlin/pom.xml
	tinkergraph-gremlin/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/72ebad21
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/72ebad21
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/72ebad21

Branch: refs/heads/master
Commit: 72ebad21dbbb41262e4ec6ebac833683e986c0e0
Parents: a1ba988 7fa75fd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 07:06:59 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 07:06:59 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  8 ++-
 docs/src/dev/developer/administration.asciidoc  | 43 +++++++++++++++-
 docs/src/dev/developer/release.asciidoc         | 52 ++++++++++++--------
 .../upgrade/release-3.1.x-incubating.asciidoc   |  5 ++
 4 files changed, 86 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ebad21/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ebad21/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/dev/developer/release.asciidoc
index ae8e912,f9baa94..91e397a
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@@ -257,4 -266,5 +268,5 @@@ The Central Maven repo has sync'd as we
  
  https://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/xx.yy.zz/
  
- [include the release line logo]
+ [include the release line logo image]
 -----
++----


[03/13] tinkerpop git commit: Add docs on submitting board reports CTR

Posted by sp...@apache.org.
Add docs on submitting board reports CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6c26a861
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6c26a861
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6c26a861

Branch: refs/heads/master
Commit: 6c26a86136d4ed5057d08601dbb80a185ba699fe
Parents: 0181d81
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 9 09:16:13 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 9 09:16:13 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/developer/administration.asciidoc | 38 +++++++++++++++++++++
 1 file changed, 38 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c26a861/docs/src/dev/developer/administration.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/administration.asciidoc b/docs/src/dev/developer/administration.asciidoc
index 80e1b24..e953989 100644
--- a/docs/src/dev/developer/administration.asciidoc
+++ b/docs/src/dev/developer/administration.asciidoc
@@ -132,5 +132,43 @@ elapsed, the invite may be sent to the new PMC member. If they accept, then the
 link:http://www.apache.org/dev/pmc.html#newpmc[How to Add a New PMC Member] section in the Apache docs for ho to
 complete the process. Use link:https://whimsy.apache.org/roster/committee/[Whimsy] to update PMC membership.
 
+Board Reports
+-------------
 
+The PMC Chair is responsible for submitting a link:http://www.apache.org/foundation/board/reporting[report to the board]
+on a quarterly basis. TinkerPop reports on the following months: January, April, July, October. The report has the
+following format:
+
+[source,text]
+----
+## Description:
+ Apache TinkerPop is a graph computing framework for both graph databases
+ (OLTP) and graph analytic systems (OLAP).
+
+## Activity:
+ <discuss general project health, project direction, community growth/activity, etc.>
+
+## Issues:
+ There are no issues requiring board attention at this time.
+
+## Releases:
+ - x.y.z (<month> <day>, <year>)
+ - x.y.z (<month> <day>, <year>)
+
+## PMC/Committer:
+
+ - Last PMC addition was <name> - <month> <year>
+ - Last committer addition was <name> - <month> <year>
+
+## Links
+
+[1] <hyperlink to external reference, if a reference was made in the report>
+----
+
+A draft of the report should be sent to the TinkerPop developer mailing list for review at least three days prior to
+submitting to the board. The final report should be sent in plain-text format to `board@apache.org` and should be
+committed to the appropriate meeting agenda in SVN at:
+
+[source,text]
+https://svn.apache.org/repos/private/foundation/board
 


[04/13] tinkerpop git commit: Fix header formatting issues to remove asciidoc warnings CTR

Posted by sp...@apache.org.
Fix header formatting issues to remove asciidoc warnings CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/74a173d2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/74a173d2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/74a173d2

Branch: refs/heads/master
Commit: 74a173d2d71efbfea40bfebba775881a07952cb8
Parents: 6c26a86
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 9 09:44:15 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 9 09:44:15 2016 -0400

----------------------------------------------------------------------
 docs/src/index.asciidoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74a173d2/docs/src/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/index.asciidoc b/docs/src/index.asciidoc
index 75d4fbe..7bc7111 100644
--- a/docs/src/index.asciidoc
+++ b/docs/src/index.asciidoc
@@ -20,7 +20,7 @@ image::apache-tinkerpop-logo.png[width=500]
 *x.y.z*
 
 TinkerPop Compendium
-====================
+--------------------
 
 image::tinkerpop-reading.png[width=800,align="center"]
 
@@ -43,7 +43,7 @@ Note the "+" following the link in each table entry - it forces an asciidoc line
 
 [[tutorials]]
 Tutorials
----------
+~~~~~~~~~
 
 [width="100%",cols="<.<3,<.^10",grid="none"]
 |=========================================================
@@ -60,7 +60,7 @@ and an overview of Gremlin. (*external*)
 
 [[publications]]
 Publications
-------------
+~~~~~~~~~~~~
 
 Unless otherwise noted, all "publications" are externally managed:
 
@@ -76,7 +76,7 @@ Unless otherwise noted, all "publications" are externally managed:
 
 [[developer]]
 Developer
----------
+~~~~~~~~~
 
 [width="100%",cols="<.<3,<.^10",grid="none"]
 |=========================================================


[07/13] tinkerpop git commit: Merge branch 'post-tp31' into tp31

Posted by sp...@apache.org.
Merge branch 'post-tp31' into tp31


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e3c950b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e3c950b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e3c950b

Branch: refs/heads/master
Commit: 1e3c950b877678fbd20b201544f65126a917fffc
Parents: 0b7da66 9337e49
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Sun Sep 11 18:39:26 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Sun Sep 11 18:39:26 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/developer/administration.asciidoc | 145 ++++++++++++++++----
 docs/src/dev/developer/release.asciidoc        |  45 +++---
 docs/src/index.asciidoc                        |   8 +-
 3 files changed, 148 insertions(+), 50 deletions(-)
----------------------------------------------------------------------



[09/13] tinkerpop git commit: Prepare changelog/upgrade docs for 3.1.5

Posted by sp...@apache.org.
Prepare changelog/upgrade docs for 3.1.5


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/239a10a4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/239a10a4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/239a10a4

Branch: refs/heads/master
Commit: 239a10a4d6265592baa9fd8590688519768da430
Parents: 19873b5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 06:40:43 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 06:40:43 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                 | 4 ++--
 docs/src/upgrade/release-3.1.x-incubating.asciidoc | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/239a10a4/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index cf44d2f..6e43233 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,8 +23,8 @@ TinkerPop 3.1.0 (A 187 On The Undercover Gremlinz)
 image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
 
 [[release-3-1-5]]
-TinkerPop 3.1.5 (NOT OFFICIALLY RELEASED YET)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+TinkerPop 3.1.5 (Release Date: NOT OFFICIALLY RELEASED YET)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/239a10a4/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.1.x-incubating.asciidoc b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
index d3fbd29..154c344 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -25,6 +25,11 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.1.4
 ---------------
 
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+TinkerPop 3.1.4
+---------------
+
 *Release Date: September 6, 2016*
 
 Please see the link:https://github.com/apache/tinkerpop/blob/3.1.4/CHANGELOG.asciidoc#tinkerpop-314-release-date-september-6-2016[changelog] for a complete list of all the modifications that are part of this release.


[05/13] tinkerpop git commit: Fixed formatting of email templates and add some notes CTR

Posted by sp...@apache.org.
Fixed formatting of email templates and add some notes CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9337e49f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9337e49f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9337e49f

Branch: refs/heads/master
Commit: 9337e49fd7b741b7ebbd3aa7bd9a2b82eae75616
Parents: 74a173d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 9 09:50:02 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 9 09:50:02 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/developer/release.asciidoc | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9337e49f/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index ae1f246..4662402 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -162,7 +162,8 @@ Email Templates
 Release VOTE
 ~~~~~~~~~~~~
 
-```
+[source,text]
+----
 Subject: [VOTE] TinkerPop xx.yy.zz Release
 
 Hello,
@@ -200,12 +201,13 @@ My vote is +1.
 
 Thank you very much,
 <TinkerPop Committer Name>
-```
+----
 
 Dev Release RESULT VOTE
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-```
+[source,text]
+----
 Subject: [RESULT][VOTE] TinkerPop xx.yy.zz Release
 
 This vote is now closed with a total of X +1s, no +0s and no -1s. The results are:
@@ -224,11 +226,17 @@ NON-BINDING VOTES:
 
 Thank you very much,
 <TinkerPop Committer Name>
-```
+----
 
 General Release Announcement
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+The template below refers to the "name of release line" and the "release line logo". Every release line has a name
+and logo. For example, 3.1.x had the name, "A 187 On The Undercover Gremlinz" and the logo shown
+link:http://tinkerpop.apache.org/docs/current/upgrade/#_tinkerpop_3_1_0[here] in the upgrade documentation.
+
+[source,text]
+----
 Subject: TinkerPop xx.yy.zz Released: [name of release line]
 
 Hello,
@@ -257,4 +265,5 @@ The Central Maven repo has sync'd as well:
 
 https://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/xx.yy.zz/
 
-[include the release line logo]
+[include the release line logo image]
+----
\ No newline at end of file


[08/13] tinkerpop git commit: Prepare changelog for 3.1.5

Posted by sp...@apache.org.
Prepare changelog for 3.1.5


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/19873b5d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/19873b5d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/19873b5d

Branch: refs/heads/master
Commit: 19873b5d3992c1db45e5c1f26d2c03787734036e
Parents: 1e3c950
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 06:39:16 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 06:39:16 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19873b5d/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4f6f1b1..cf44d2f 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -22,9 +22,15 @@ TinkerPop 3.1.0 (A 187 On The Undercover Gremlinz)
 
 image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
 
+[[release-3-1-5]]
+TinkerPop 3.1.5 (NOT OFFICIALLY RELEASED YET)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
 [[release-3-1-4]]
 TinkerPop 3.1.4 (Release Date: September 6, 2016)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Improved the error provided by a client-side session if no hosts were available.
 * Fixed a bug in `PropertiesTest` which assumed long id values.


[11/13] tinkerpop git commit: Add more notes/clarifications to release documentation CTR

Posted by sp...@apache.org.
Add more notes/clarifications to release documentation CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7fa75fdd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7fa75fdd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7fa75fdd

Branch: refs/heads/master
Commit: 7fa75fdd2cc58f458e1d9f8ed4251a1a80100c8a
Parents: 23abbe1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Sep 12 06:57:33 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Sep 12 06:57:33 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/developer/release.asciidoc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fa75fdd/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 4662402..f9baa94 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -133,10 +133,10 @@ for generating javadoc and without that the binary distributions won't contain t
 . Prepare Git administration tasks. Note that this work can be performed at the release manager's discretion. It may be wise to wait until a successful VOTE is eminent before reopening development. Apply the following steps as needed per release branch:
 .. Make the appropriate branching changes as required by the release and bump the version to `SNAPSHOT` with
 `mvn versions:set -DnewVersion=xx.yy.zz-SNAPSHOT -DgenerateBackupPoms=false`.
+.. Update CHANGELOG and upgrade docs to have the appropriate headers for the next version.
 .. `mvn clean install -DskipTests` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
 .. `mvn deploy` - deploy the new `SNAPSHOT`
-.. `bin/process-docs.sh` and validate the generated `SNAPSHOT` documentation locally
-.. `bin/publish-docs.sh <username>` to publish the `SNAPSHOT` docs which enables the README to work properly.
+.. `bin/process-docs.sh` and validate the generated `SNAPSHOT` documentation locally and then `bin/publish-docs.sh <username>`
 .. Commit and push the `SNAPSHOT` changes to git
 .. Send email to advise that code freeze is lifted.
 .. Generate a list of dead branches that will be automatically deleted and post them as a DISCUSS thread for review, then once consensus is reached removed those branches.
@@ -152,7 +152,8 @@ Release & Promote
 . Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`.
 . `cd release; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz 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/]).
+. Wait for Apache Sonatype to sync the artifacts to Maven Central at (link:http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/[http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/]).
+. Wait for zip distributions to to sync to the Apache mirrors (i.e ensure the download links work from a mirror).
 . If there are releases present in SVN that represents lines of code that are no longer under development, then remove those releases. In other words, if `3.2.0` is present and `3.2.1` is released then remove `3.2.0`.  However, if `3.1.3` is present and that line of code is still under potential development, it may stay.
 . Announce release on `dev@`/`gremlin-users@` mailing lists and tweet from `@apachetinkerpop`