tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plur...@apache.org
Subject [08/22] tinkerpop git commit: Remove final references to "incubator".
Date Sat, 30 Jul 2016 14:40:55 GMT
Remove final references to "incubator".


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

Branch: refs/heads/TINKERPOP-1360
Commit: d61bbdb41d5353cfeb31dcc32012326f7af79ccc
Parents: cc05d4c
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Sat Jul 16 12:57:13 2016 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Sat Jul 16 12:57:13 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  4 +-
 README.asciidoc                                 |  2 +-
 bin/validate-distribution.sh                    |  8 ++--
 docs/javadoc/overview.html                      |  2 +-
 docs/src/dev/developer/administration.asciidoc  |  5 ---
 docs/src/dev/developer/contributing.asciidoc    |  4 +-
 docs/src/dev/developer/for-committers.asciidoc  | 18 ++++----
 docs/src/dev/developer/release.asciidoc         | 45 +++++---------------
 docs/src/reference/acknowledgements.asciidoc    |  8 ----
 .../tutorials/getting-started/index.asciidoc    |  4 +-
 .../upgrade/release-3.0.x-incubating.asciidoc   |  8 ++--
 .../upgrade/release-3.1.x-incubating.asciidoc   | 10 ++---
 .../archetype-resources/README.asciidoc         |  2 +-
 pom.xml                                         |  6 +--
 .../structure/TinkerGraphPlayTest.java          |  2 +-
 15 files changed, 46 insertions(+), 82 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d013861..9539582 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -20,7 +20,7 @@ TinkerPop3 CHANGELOG
 TinkerPop 3.1.0 (A 187 On The Undercover Gremlinz)
 --------------------------------------------------
 
-image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
 
 [[release-3-1-3]]
 TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
@@ -486,7 +486,7 @@ Improvements
 TinkerPop 3.0.0 (A Gremlin Rāga in 7/16 Time)
 ---------------------------------------------
 
-image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/gremlin-hindu.png[width=225]
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-hindu.png[width=225]
 
 [[release-3-0-2-incubating]]
 TinkerPop 3.0.2 (Release Date: October 19, 2015)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index f071aa1..8d9e35f 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -17,7 +17,7 @@ limitations under the License.
 TinkerPop3
 ----------
 
-image:https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/tinkerpop3-splash.png[TinkerPop3,
link="http://tinkerpop.apache.org"]
+image:https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/tinkerpop3-splash.png[TinkerPop3,
link="http://tinkerpop.apache.org"]
 
 Documentation
 ~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index eea1ba1..399acdb 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -23,7 +23,7 @@
 # published KEYS file in order for that aspect of the validation
 # to pass.
 #
-# curl -L -O http://archive.apache.org/dist/incubator/tinkerpop/KEYS
+# curl -L -O https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS
 # gpg --import KEYS
 
 TMP_DIR="/tmp/tpdv"
@@ -39,9 +39,9 @@ fi
 
 if [ -z ${URL} ]; then
 
-  CONSOLE_URL="https://dist.apache.org/repos/dist/dev/incubator/tinkerpop/${VERSION}/apache-gremlin-console-${VERSION}-bin.zip"
-  SERVER_URL="https://dist.apache.org/repos/dist/dev/incubator/tinkerpop/${VERSION}/apache-gremlin-server-${VERSION}-bin.zip"
-  SOURCE_URL="https://dist.apache.org/repos/dist/dev/incubator/tinkerpop/${VERSION}/apache-tinkerpop-${VERSION}-src.zip"
+  CONSOLE_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-gremlin-console-${VERSION}-bin.zip"
+  SERVER_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-gremlin-server-${VERSION}-bin.zip"
+  SOURCE_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-tinkerpop-${VERSION}-src.zip"
 
   echo -e "\nValidating binary distributions\n"
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/docs/javadoc/overview.html
----------------------------------------------------------------------
diff --git a/docs/javadoc/overview.html b/docs/javadoc/overview.html
index c1defb4..118f40f 100644
--- a/docs/javadoc/overview.html
+++ b/docs/javadoc/overview.html
@@ -17,7 +17,7 @@ limitations under the License.
 <html>
 <body>
 <!-- The contents below get injected to the javadoc "overview.html".  -->
-<a href="http://tinkerpop.apache.org" target="_blank"><img src="https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/apache-tinkerpop-logo.png"
width="300px"/></a><br/>
+<a href="http://tinkerpop.apache.org" target="_blank"><img src="https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/apache-tinkerpop-logo.png"
width="300px"/></a><br/>
 TinkerPop3 provides graph computing capabilities for both graph databases (OLTP) and graph
analytic systems (OLAP) under the Apache2 license.
 </body>
 </html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/docs/src/dev/developer/administration.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/administration.asciidoc b/docs/src/dev/developer/administration.asciidoc
index db8fa4d..e1eb352 100644
--- a/docs/src/dev/developer/administration.asciidoc
+++ b/docs/src/dev/developer/administration.asciidoc
@@ -83,10 +83,5 @@ Being a committer enables easier contribution to the project since there
is no n
 process. This should enable better productivity.
 ----
 
-Finally, update the TinkerPop incubator project status page by:
-
-. Adding to the "News" section
-. Adding to the "Committers" section
-
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index 5f705da..bcc2e04 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -60,7 +60,7 @@ Reviewing Changes
 ~~~~~~~~~~~~~~~~~
 
 Virtually all changes to TinkerPop's source code are performed via GitHub
-link:https://github.com/apache/incubator-tinkerpop/pulls[pull requests]. When a pull request
is issue it undergoes a
+link:https://github.com/apache/tinkerpop/pulls[pull requests]. When a pull request is issue
it undergoes a
 <<rtc,review process>> prior to be merged to a release branch. Anyone is free
to comment and provide a vote (+1/+0/-1)
 on a pull request. Note that votes of non-commiters are considered non-binding, but are certainly
considered in the
 review process.
@@ -175,7 +175,7 @@ before proceeding to implement the change.
 Next, *make changes* and prepare a *pull request*:
 
 . link:https://help.github.com/articles/fork-a-repo/[Fork and then clone] the Apache TinkerPop
-link:https://github.com/apache/incubator-tinkerpop[GitHub repository] if not already done.
+link:https://github.com/apache/tinkerpop[GitHub repository] if not already done.
 . Make changes in the fork
 .. It is typically best to create a branch for the changes. Consider naming that branch after
the JIRA issue number
 to easily track what that branch is for.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/docs/src/dev/developer/for-committers.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/for-committers.asciidoc b/docs/src/dev/developer/for-committers.asciidoc
index 49f1899..5f0713d 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -25,7 +25,7 @@ Communication
 -------------
 
 TinkerPop has a link:http://groups.google.com/group/gremlin-users[user mailing list] and
a
-link:http://mail-archives.apache.org/mod_mbox/incubator-tinkerpop-dev/[developer mailing
list].  As a committer,
+link:https://lists.apache.org/list.html?dev@tinkerpop.apache.org[developer mailing list].
 As a committer,
 it is a good idea to join both.
 
 It would also be helpful to join the public link:https://s.apache.org/tinkerpop[TinkerPop
HipChat room] for developer
@@ -126,8 +126,8 @@ TinkerPop uses both link:https://travis-ci.com/[Travis] and link:https://www.app
 link:https://en.wikipedia.org/wiki/Continuous_integration[CI] services. Travis validates
builds on Ubuntu, while
 AppVeyor validates builds on Windows.  The build statuses can be found here:
 
-* link:https://travis-ci.org/apache/incubator-tinkerpop[Travis Build Status]
-* link:https://ci.appveyor.com/project/ApacheSoftwareFoundation/incubator-tinkerpop[AppVeyor
Build Status]
+* link:https://travis-ci.org/apache/tinkerpop[Travis Build Status]
+* link:https://ci.appveyor.com/project/ApacheSoftwareFoundation/tinkerpop[AppVeyor Build
Status]
 
 Note that the CI process does not run integration tests or include Neo4j-related tests as
those tests would likely
 exceed the allowable times for builds on these servers.
@@ -179,7 +179,7 @@ can cause problems for some graph providers.
 * Tests that are designed to use a `GraphProvider` implementation in conjunction with `AbstractGremlinTest`
_and_ are
 in the `/test` directory should not be named with `Test` as the suffix, as this will cause
them to execute in some
 environments without a `GraphProvider` being initialized by a suite. These types of tests
should be suffixed with
-`Check` instead. Please see link:https://github.com/apache/incubator-tinkerpop/blob/e32a4187e4f25e290aabe14007f9087c48a06521/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NativeNeo4jStructureCheck.java[NativeNeo4jStructureCheck]
+`Check` instead. Please see link:https://github.com/apache/tinkerpop/blob/e32a4187e4f25e290aabe14007f9087c48a06521/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NativeNeo4jStructureCheck.java[NativeNeo4jStructureCheck]
 for an example.
 
 Gremlin Language Test Cases
@@ -284,12 +284,12 @@ and its distribution.
 To get started, TinkerPop has both "source" and "binary" LICENSE/NOTICE files:
 
 * Source LICENSE/NOTICE relate to files packaged with the released source code distribution:
-link:https://github.com/apache/incubator-tinkerpop/blob/master/LICENSE[LICENSE] / link:https://github.com/apache/incubator-tinkerpop/blob/master/NOTICE[NOTICE]
+link:https://github.com/apache/tinkerpop/blob/master/LICENSE[LICENSE] / link:https://github.com/apache/tinkerpop/blob/master/NOTICE[NOTICE]
 * Binary LICENSE/NOTICE relate to files packaged with the released binary distributions:
-** Gremlin Console link:https://github.com/apache/incubator-tinkerpop/blob/master/gremlin-console/src/main/LICENSE[LICENSE]
-/ link:https://github.com/apache/incubator-tinkerpop/blob/master/gremlin-console/src/main/NOTICE[NOTICE]
-** Gremlin Server link:https://github.com/apache/incubator-tinkerpop/blob/master/gremlin-server/src/main/LICENSE[LICENSE]
-/ link:https://github.com/apache/incubator-tinkerpop/blob/master/gremlin-server/src/main/NOTICE[NOTICE]
+** Gremlin Console link:https://github.com/apache/tinkerpop/blob/master/gremlin-console/src/main/LICENSE[LICENSE]
+/ link:https://github.com/apache/tinkerpop/blob/master/gremlin-console/src/main/NOTICE[NOTICE]
+** Gremlin Server link:https://github.com/apache/tinkerpop/blob/master/gremlin-server/src/main/LICENSE[LICENSE]
+/ link:https://github.com/apache/tinkerpop/blob/master/gremlin-server/src/main/NOTICE[NOTICE]
 
 Source LICENSE and NOTICE
 ~~~~~~~~~~~~~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index db936f3..e0a83b7 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -25,7 +25,6 @@ feedback.  Once a release point has been identified, the following phases
repres
 * Pre-flight check.
 * Optionally, produce a release candidate for community feedback.
 * Submit the official release for PMC vote.
-* Submit the official release for Incubator vote.
 * Release and promote.
 
 NOTE: It might be helpful to use this document as generated from the currently release as
opposed to one generate
@@ -114,8 +113,8 @@ current release was under development as this new release will have those
change
 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/incubator/tinkerpop` for `[VOTE]`
review.
-.. `svn co --depth empty https://dist.apache.org/repos/dist/dev/incubator/tinkerpop/ dev`
and `mkdir dev/xx.yy.zz`
+. 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`
 .. `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`
@@ -141,21 +140,12 @@ handled document generation and this step now merely needs to upload
what was ge
 . Submit for `[VOTE]` at `dev@tinkerpop.apache.org` (see email template below)
 . *Wait for vote acceptance* (72 hours)
 
-Incubator Vote
---------------
-
-A positive vote for a particular release from the Apache Incubator is required to move to
the following phase.
-
-. Submit for `[VOTE]` at `general@incubator.apache.org` (see email template below)
-.. Include the vote tally: "Apache TinkerPop (http://tinkerpop.apache.org/) would like to
release TinkerPop xx.yy.zz. We had a dev@ VOTE which resulted in a tally of +1 (3), 0 (0),
and -1 (0). We now present our artifacts for vote by Incubator."
-. *Wait for vote acceptance* (72 hours)
-
 Release & Promote
 -----------------
 
 . Login to link:https://repository.apache.org/[Apache Nexus] and release the previously closed
repository.
-. `svn co --depth empty https://dist.apache.org/repos/dist/dev/incubator/tinkerpop dev; svn
up dev/xx.yy.zz`
-. `svn co --depth empty https://dist.apache.org/repos/dist/release/incubator/tinkerpop release;
mkdir release/xx.yy.zz`
+. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; svn up dev/xx.yy.zz`
+. `svn co --depth empty https://dist.apache.org/repos/dist/release/tinkerpop release; mkdir
release/xx.yy.zz`
 . 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.
@@ -177,7 +167,7 @@ Hello,
 We are happy to announce that TinkerPop xx.yy.zz is ready for release.
 
 The release artifacts can be found at this location:
-	https://dist.apache.org/repos/dist/dev/incubator/tinkerpop/xx.yy.zz/
+	https://dist.apache.org/repos/dist/dev/tinkerpop/xx.yy.zz/
 
 The source distribution is provided by:
 	apache-tinkerpop-xx.yy.zz-src.zip
@@ -187,7 +177,7 @@ Two binary distributions are provided for user convenience:
 	apache-gremlin-server-xx.yy.zz-bin.zip
 
 The GPG key used to sign the release artifacts is available at:
-    https://dist.apache.org/repos/dist/dev/incubator/tinkerpop/KEYS
+    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)
@@ -196,10 +186,10 @@ The online docs can be found here:
 	http://tinkerpop.apache.org/javadocs/xx.yy.zz/full/ (full javadoc)
 
 The tag in Apache Git can be found here:
-	https://git-wip-us.apache.org/repos/asf?p=incubator-tinkerpop.git;XXXXXXXXXXXXXXXXXX
+	https://git-wip-us.apache.org/repos/asf?p=tinkerpop.git;XXXXXXXXXXXXXXXXXX
 
 The release notes are available here:
-	https://github.com/apache/incubator-tinkerpop/blob/master/CHANGELOG.asciidoc#XXXXXXXXXXXXXXXXXX
+	https://github.com/apache/tinkerpop/blob/master/CHANGELOG.asciidoc#XXXXXXXXXXXXXXXXXX
 
 The [VOTE] will be open for the next 72 hours --- closing <DayOfTheWeek> (<Month>
<Day> <Year>) at <Time> <TimeZone>.
 
@@ -209,19 +199,6 @@ Thank you very much,
 <TinkerPop Committer Name>
 ```
 
-If the above email template is used for the "Incubator Vote", then it should include the
following just after the
-"release notes":
-
-```
-Finally, the dev@tinkerpop [VOTE] thread can be found at this location:
-
-    https://pony-poc.apache.org/thread.html/XXXXXXXXXXXXXXXXXX
-
-Result summary: +X (Y binding, Z non-binding), 0 (0), -1 (0)
-```
-
-where this link should point to the result of the VOTE.
-
 Dev Release RESULT VOTE
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -258,8 +235,8 @@ there is breaking change, an important game-changing feature or two, etc.]
 
 The release artifacts can be found at this location:
 
-https://www.apache.org/dyn/closer.lua/incubator/tinkerpop/xx.yy.zz/apache-gremlin-console-xx.yy.zz-bin.zip
-https://www.apache.org/dyn/closer.lua/incubator/tinkerpop/xx.yy.zz/apache-gremlin-server-xx.yy.zz-bin.zip
+https://www.apache.org/dyn/closer.lua/tinkerpop/xx.yy.zz/apache-gremlin-console-xx.yy.zz-bin.zip
+https://www.apache.org/dyn/closer.lua/tinkerpop/xx.yy.zz/apache-gremlin-server-xx.yy.zz-bin.zip
 
 The online docs can be found here:
 
@@ -271,7 +248,7 @@ http://tinkerpop.apache.org/docs/xx.yy.zz/some-new-content/ (some new
content) [
 
 The release notes are available here:
 
-https://github.com/apache/incubator-tinkerpop/blob/xx.yy.zz/CHANGELOG.asciidoc#XXXXXXXXXXXXXXXXXX
+https://github.com/apache/tinkerpop/blob/xx.yy.zz/CHANGELOG.asciidoc#XXXXXXXXXXXXXXXXXX
 
 The Central Maven repo has sync'd as well:
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/docs/src/reference/acknowledgements.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/acknowledgements.asciidoc b/docs/src/reference/acknowledgements.asciidoc
index 76cddec..0ce909d 100644
--- a/docs/src/reference/acknowledgements.asciidoc
+++ b/docs/src/reference/acknowledgements.asciidoc
@@ -23,14 +23,6 @@ Java Profiler. YourKit, LLC is the creator of innovative and intelligent
tools f
 applications. YourKit's leading software products: link:http://www.yourkit.com/java/profiler/index.jsp[YourKit
Java Profiler]
 and link:http://www.yourkit.com/.net/profiler/index.jsp[YourKit .NET Profiler]
 
-image:egg-logo.png[width=200,float=left] link:http://incubator.apache.org/projects/tinkerpop.html[Apache
TinkerPop] is
-an effort undergoing incubation at link:http://apache.org[The Apache Software Foundation]
(ASF), sponsored by the
-Apache Incubator. Incubation is required of all newly accepted projects until a further review
indicates that the
-infrastructure, communications, and decision making process have stabilized in a manner consistent
with other
-successful ASF projects. While incubation status is not necessarily a reflection of the completeness
or stability of
-the code, it does indicate that the project has yet to be fully endorsed by the ASF. Apache
TinkerPop is distributed
-under the Apache License v2.0.
-
 image:ketrina-tinkerpop3.png[width=150,float=right] link:http://ketrinayim.tumblr.com[Ketrina
Yim] -- Designing
 Gremlin and his friends for TinkerPop was one of my first major projects as a freelancer,
and it's delightful to
 see them on the Web and all over the documentation! Drawing and tweaking the characters over
time is like watching

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/docs/src/tutorials/getting-started/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/tutorials/getting-started/index.asciidoc b/docs/src/tutorials/getting-started/index.asciidoc
index 5fcc30e..0893188 100644
--- a/docs/src/tutorials/getting-started/index.asciidoc
+++ b/docs/src/tutorials/getting-started/index.asciidoc
@@ -51,7 +51,7 @@ NOTE: Are you unsure of what a vertex or edge is? That topic is covered
in the <
 but please allow the tutorial to get you oriented with the Gremlin Console first, so that
you have an understanding of
 the tool that will help you with your learning experience.
 
-link:https://www.apache.org/dyn/closer.lua/incubator/tinkerpop/x.y.z/apache-gremlin-console-x.y.z-bin.zip[Download
the console],
+link:https://www.apache.org/dyn/closer.lua/tinkerpop/x.y.z/apache-gremlin-console-x.y.z-bin.zip[Download
the console],
 unpackage it and start it:
 
 [source,text]
@@ -532,7 +532,7 @@ containing a Gremlin script to be processed with results returned.
 
 [source,text]
 ----
-$ curl -L -O https://www.apache.org/dist/incubator/tinkerpop/x.y.z/apache-gremlin-server-x.y.z-bin.zip
+$ curl -L -O https://www.apache.org/dist/tinkerpop/x.y.z/apache-gremlin-server-x.y.z-bin.zip
 $ unzip apache-gremlin-server-x.y.z-bin.zip
 $ cd apache-gremlin-server-x.y.z-bin.zip
 $ bin/gremlin-server.sh conf/gremlin-server-modern.yaml

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/docs/src/upgrade/release-3.0.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.0.x-incubating.asciidoc b/docs/src/upgrade/release-3.0.x-incubating.asciidoc
index 06210de..1d5be4d 100644
--- a/docs/src/upgrade/release-3.0.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.0.x-incubating.asciidoc
@@ -18,7 +18,7 @@ limitations under the License.
 TinkerPop 3.0.0
 ===============
 
-image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/gremlin-hindu.png[width=225]
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-hindu.png[width=225]
 
 *A Gremlin Rāga in 7/16 Time*
 
@@ -27,7 +27,7 @@ TinkerPop 3.0.2
 
 *Release Date: October 19, 2015*
 
-Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.0.2-incubating/CHANGELOG.asciidoc#tinkerpop-302-release-date-october-19-2015[changelog]
for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.0.2-incubating/CHANGELOG.asciidoc#tinkerpop-302-release-date-october-19-2015[changelog]
for a complete list of all the modifications that are part of this release.
 
 Upgrading for Users
 ~~~~~~~~~~~~~~~~~~~
@@ -90,7 +90,7 @@ TinkerPop 3.0.1
 
 *Release Date: September 2, 2015*
 
-Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.0.1-incubating/CHANGELOG.asciidoc#tinkerpop-301-release-date-september-2-2015[changelog]
for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.0.1-incubating/CHANGELOG.asciidoc#tinkerpop-301-release-date-september-2-2015[changelog]
for a complete list of all the modifications that are part of this release.
 
 Upgrading for Users
 ~~~~~~~~~~~~~~~~~~~
@@ -106,7 +106,7 @@ capabilities, especially when combined with its built-in SSL feature.
 There have also been changes in how global variable bindings in Gremlin Server are established
via initialization
 scripts.  The initialization scripts now allow for a `Map` of values that can be returned
from those scripts.  
 That `Map` will be used to set global bindings for the server. See this 
-link:https://github.com/apache/incubator-tinkerpop/blob/3.0.1-incubating/gremlin-server/scripts/generate-modern.groovy[sample
script] 
+link:https://github.com/apache/tinkerpop/blob/3.0.1-incubating/gremlin-server/scripts/generate-modern.groovy[sample
script]
 for an example.
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-576[TINKERPOP-576]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/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 956590e..fc6a9ae 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -18,7 +18,7 @@ limitations under the License.
 TinkerPop 3.1.0
 ===============
 
-image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/static/images/gremlin-gangster.png[width=225]
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-gangster.png[width=225]
 
 *A 187 On The Undercover Gremlinz*
 
@@ -27,7 +27,7 @@ TinkerPop 3.1.3
 
 *Release Date: NOT OFFICIALLY RELEASED YET*
 
-Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.1.3/CHANGELOG.asciidoc#tinkerpop-313-release-date-MONTH-DAY-YEAR[changelog]
for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.1.3/CHANGELOG.asciidoc#tinkerpop-313-release-date-MONTH-DAY-YEAR[changelog]
for a complete list of all the modifications that are part of this release.
 
 Upgrading for Users
 ~~~~~~~~~~~~~~~~~~~
@@ -137,7 +137,7 @@ TinkerPop 3.1.2
 
 *Release Date: April 8, 2016*
 
-Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.1.2-incubating/CHANGELOG.asciidoc#tinkerpop-312-release-date-april-8-2016[changelog]
for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.1.2-incubating/CHANGELOG.asciidoc#tinkerpop-312-release-date-april-8-2016[changelog]
for a complete list of all the modifications that are part of this release.
 
 Upgrading for Users
 ~~~~~~~~~~~~~~~~~~~
@@ -282,7 +282,7 @@ TinkerPop 3.1.1
 
 *Release Date: February 8, 2016*
 
-Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.1.1-incubating/CHANGELOG.asciidoc#tinkerpop-311-release-date-february-8-2016[changelog]
for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.1.1-incubating/CHANGELOG.asciidoc#tinkerpop-311-release-date-february-8-2016[changelog]
for a complete list of all the modifications that are part of this release.
 
 Upgrading for Users
 ~~~~~~~~~~~~~~~~~~~
@@ -491,7 +491,7 @@ TinkerPop 3.1.0
 
 *Release Date: November 16, 2015*
 
-Please see the link:https://github.com/apache/incubator-tinkerpop/blob/3.1.0-incubating/CHANGELOG.asciidoc#tinkerpop-310-release-date-november-16-2015[changelog]
for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.1.0-incubating/CHANGELOG.asciidoc#tinkerpop-310-release-date-november-16-2015[changelog]
for a complete list of all the modifications that are part of this release.
 
 Additional upgrade information can be found here:
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
index fd543bc..3a30a15 100644
--- a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
+++ b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/README.asciidoc
@@ -28,7 +28,7 @@ Prerequisites
 
 * Java 8 Update 40+
 * link:https://maven.apache.org/[Maven 3.x]
-* Gremlin Server is link:http://archive.apache.org/dist/incubator/tinkerpop/[downloaded]
and unpackaged
+* Gremlin Server is link:http://archive.apache.org/dist/tinkerpop/[downloaded] and unpackaged
 
 Building and Running
 --------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fe9d781..6f28813 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,9 +121,9 @@ limitations under the License.
         <module>gremlin-archetype</module>
     </modules>
     <scm>
-        <connection>scm:git:git@git-wip-us.apache.org:repos/asf/incubator-tinkerpop.git</connection>
-        <developerConnection>scm:git:git@git-wip-us.apache.org:repos/asf/incubator-tinkerpop.git</developerConnection>
-        <url>https://git-wip-us.apache.org/repos/asf?p=incubator-tinkerpop.git</url>
+        <connection>scm:git:git@git-wip-us.apache.org:repos/asf/tinkerpop.git</connection>
+        <developerConnection>scm:git:git@git-wip-us.apache.org:repos/asf/tinkerpop.git</developerConnection>
+        <url>https://git-wip-us.apache.org/repos/asf?p=tinkerpop.git</url>
     </scm>
     <properties>
         <commons.configuration.version>1.10</commons.configuration.version>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d61bbdb4/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
index 269f400..3e1869f 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java
@@ -211,7 +211,7 @@ public class TinkerGraphPlayTest {
 
         Graph graph = TinkerGraph.open();
         GraphTraversalSource g = graph.traversal();
-        graph.io(GraphMLIo.build()).readGraph("/projects/apache/incubator-tinkerpop/data/grateful-dead.xml");
+        graph.io(GraphMLIo.build()).readGraph("/projects/apache/tinkerpop/data/grateful-dead.xml");
         System.out.println(g.V().filter(outE("sungBy").count().is(0)).explain());
         System.out.println(g.V().filter(outE("sungBy").count().is(lt(1))).explain());
         System.out.println(g.V().filter(outE("sungBy").count().is(1)).explain());


Mime
View raw message