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/04/20 22:14:23 UTC
[21/21] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/3.0.0.M8-revised'
Merge remote-tracking branch 'origin/3.0.0.M8-revised'
Conflicts:
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
pom.xml
tinkergraph-gremlin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8df91fcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8df91fcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8df91fcf
Branch: refs/heads/master
Commit: 8df91fcf40daff3d57a3c0acd068e4df716338a5
Parents: f02af31 6a2ca8e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 20 16:13:17 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 20 16:13:17 2015 -0400
----------------------------------------------------------------------
LICENSE | 33 +-
NOTICE | 12 +-
README.asciidoc | 2 +
docs/stylesheets/asciidoctor.css | 656 -------------------
docs/stylesheets/colony.css | 662 --------------------
docs/stylesheets/foundation-lime.css | 659 -------------------
docs/stylesheets/foundation-potion.css | 659 -------------------
docs/stylesheets/foundation.css | 650 -------------------
docs/stylesheets/github.css | 671 --------------------
docs/stylesheets/golo.css | 673 --------------------
docs/stylesheets/iconic.css | 694 ---------------------
docs/stylesheets/maker.css | 670 --------------------
docs/stylesheets/readthedocs.css | 671 --------------------
docs/stylesheets/riak.css | 691 --------------------
docs/stylesheets/rocket-panda.css | 664 --------------------
docs/stylesheets/rubygems.css | 652 -------------------
docs/stylesheets/tinkerpop.css | 19 +
docs/stylesheets/tinkerpop.scss | 83 ---
gremlin-console/bin/gremlin.sh | 4 +-
gremlin-console/pom.xml | 2 +-
gremlin-console/src/assembly/distribution.xml | 16 +-
gremlin-console/src/assembly/standalone.xml | 3 +
gremlin-console/src/main/LICENSE | 2 +-
gremlin-server/pom.xml | 2 +-
gremlin-server/src/assembly/distribution.xml | 16 +-
gremlin-server/src/assembly/standalone.xml | 3 +
gremlin-server/src/main/LICENSE | 2 +-
pom.xml | 1 -
28 files changed, 95 insertions(+), 8777 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8df91fcf/README.asciidoc
----------------------------------------------------------------------
diff --cc README.asciidoc
index e92b6dc,b671453..be4d454
--- a/README.asciidoc
+++ b/README.asciidoc
@@@ -30,16 -30,12 +30,18 @@@ Documentatio
Building and Testing
~~~~~~~~~~~~~~~~~~~~
+ TinkerPop requires `Java 1.8.0_40+` for proper building and proper operations.
+
* Build Project: `mvn clean install`
-** Specify specific tests in a TinkerPop Suite to run: `mvn test -Dgremlin.tests={test class 1, test class 2...}` - note that including a specific test may require its inner class implementation (e.g. `org.apache.tinkerpop.gremlin....UnionTest$ComputerTest`)
+** Specify specific tests in a TinkerPop Suite to run with the `GREMLIN_TESTS` environment variable, along with the Maven project list argument, e.g.:
++
+----
+export GREMLIN_TESTS='org.apache.tinkerpop.gremlin.process.traversal.step.map.PathTest$Traversals,org.apache.tinkerpop.gremlin.process.traversal.step.util.PathTest'
+mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
+----
** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes`
* Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory
+** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `TinkerGraphTest.shouldWriteGratefulDead`)
* Check license headers are present: `mvn apache-rat:check`
* Build AsciiDocs: `docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc`
* Build JavaDocs: `mvn process-resources -Djavadoc`
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8df91fcf/gremlin-console/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8df91fcf/gremlin-console/src/main/LICENSE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8df91fcf/gremlin-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8df91fcf/gremlin-server/src/main/LICENSE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8df91fcf/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3a86e9d,842e853..45244ae
--- a/pom.xml
+++ b/pom.xml
@@@ -223,9 -233,7 +223,8 @@@ limitations under the License
<excludes>
<exclude>.repository/**</exclude>
<exclude>docs/static/**</exclude>
- <exclude>docs/stylesheets/**</exclude>
<exclude>**/target/**</exclude>
+ <exclude>data/*.txt</exclude>
<exclude>**/*.kryo</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.json</exclude>