This is an automated email from the ASF dual-hosted git repository.
dkuppitz pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 219bc936f9bd99467a717bcfb8321b0d06cd6031
Author: stephen <spmalle...@gmail.com>
AuthorDate: Tue Nov 12 08:08:53 2019 -0500
TINKERPOP-2076 Cleaned up references to "java 8"
---
CHANGELOG.asciidoc | 1 +
docs/site/home/providers.html | 2 +-
docs/src/dev/developer/for-committers.asciidoc | 2 +-
docs/src/dev/provider/index.asciidoc | 4 ++--
docs/src/reference/gremlin-applications.asciidoc | 2 +-
docs/src/reference/implementations-tinkergraph.asciidoc | 2 +-
docs/src/upgrade/appendix.asciidoc | 4 ++--
.../src/main/resources/archetype-resources/README.asciidoc | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 9 +++++----
.../src/main/resources/archetype-resources/README.asciidoc | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 11 ++++++-----
.../src/main/resources/archetype-resources/README.asciidoc | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 9 +++++----
.../gremlin/tinkergraph/process/computer/TinkerMessenger.java | 2 +-
14 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e3e3ec4..40310c8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -43,6 +43,7 @@ This release also includes changes from <<release-3-4-3,
3.4.3>>.
* Configured GraphSON 3.0 as the default text serialization format when no
serializer can be determined.
* Bumped to Neo4j 3.4.11.
* Bumped to Spark 3.0.0.
+* Supported build for Java 11.
* Added a parameterized `TypeTranslator` for use with `GroovyTranslator` that
should produce more cache hits.
* Added support for `TextP` in Neo4j using its string search functions.
* Changed `TraversalStrategy` application methodology to apply each strategy
in turn to each level of the traversal hierarchy starting from root down to
children.
diff --git a/docs/site/home/providers.html b/docs/site/home/providers.html
index 093b5e2..e9136b7 100644
--- a/docs/site/home/providers.html
+++ b/docs/site/home/providers.html
@@ -280,7 +280,7 @@ WHERE(Created.by(Friends.of("gremlin")))</code></pre>
</div>
<div class="col-sm-6 col-md-6">
<a
href="http://tinkerpop.apache.org/docs/current/reference/#_on_gremlin_language_variants";><img
src="img/logos/gremlin-java-logo.png"
style="padding-right:20px;float:left;width:35%;"></a>
- <a
href="http://tinkerpop.apache.org/docs/current/reference/#_on_gremlin_language_variants";>Gremlin-Java</a>
represents Gremlin inside the Java8 language. Gremlin-Java is considered the
canonical, reference implementation of Gremlin and is the primary compiler for
all lambda-free bytecode due to its speed relative to other script-based, JVM
variants.
+ <a
href="http://tinkerpop.apache.org/docs/current/reference/#_on_gremlin_language_variants";>Gremlin-Java</a>
represents Gremlin inside the Java language. Gremlin-Java is considered the
canonical, reference implementation of Gremlin and is the primary compiler for
all lambda-free bytecode due to its speed relative to other script-based, JVM
variants.
</div>
</div>
<br/>
diff --git a/docs/src/dev/developer/for-committers.asciidoc
b/docs/src/dev/developer/for-committers.asciidoc
index f835190..9ae3fcf 100644
--- a/docs/src/dev/developer/for-committers.asciidoc
+++ b/docs/src/dev/developer/for-committers.asciidoc
@@ -226,7 +226,7 @@ When writing a Java test case for a Gremlin step, be sure
to use the following c
** `get_g_V_groupCount_byXnameX()`
** `get_g_V_groupCountXaX_byXnameX_capXaX()`
* The name of the actual test case should be the name of the traversal
generator minus the `get_` prefix.
-* The Gremlin-Groovy version of the test should use the sugar syntax in order
to test sugar (as Gremlin-Java8 tests test standard syntax).
+* The Gremlin-Groovy version of the test should use the sugar syntax in order
to test sugar (as Gremlin-Java tests test standard syntax).
** `g.V.age.sum`
* Avoid using lambdas in the test case unless that is explicitly what is being
tested as OLAP systems will typically not be able to execute those tests.
* `AbstractGremlinProcessTest` has various static methods to make writing a
test case easy.
diff --git a/docs/src/dev/provider/index.asciidoc
b/docs/src/dev/provider/index.asciidoc
index 91beaf1..33263d3 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -39,7 +39,7 @@ This document attempts to address the needs of the different
providers that have
[[graph-system-provider-requirements]]
== Graph System Provider Requirements
-image:tinkerpop-enabled.png[width=140,float=left] At the core of TinkerPop 3.x
is a Java8 API. The implementation of this
+image:tinkerpop-enabled.png[width=140,float=left] At the core of TinkerPop 3.x
is a Java API. The implementation of this
core API and its validation via the `gremlin-test` suite is all that is
required of a graph system provider wishing to
provide a TinkerPop-enabled graph engine. Once a graph system has a valid
implementation, then all the applications
provided by TinkerPop (e.g. Gremlin Console, Gremlin Server, etc.) and
3rd-party developers (e.g. Gremlin-Scala,
@@ -79,7 +79,7 @@ In the above code all the vertices are created first and then
their respective e
`Graph.addVertex(Object...)` or `Vertex.addEdge(String,Vertex,Object...)`, the
respective element is created along
with the provided key/value pair properties appended to it.
-Below is a sequence of basic graph mutation operations represented in Java 8.
+Below is a sequence of basic graph mutation operations represented in Java:
image:basic-mutation.png[width=240,float=right]
[source,java]
diff --git a/docs/src/reference/gremlin-applications.asciidoc
b/docs/src/reference/gremlin-applications.asciidoc
index 6888f33..605fb06 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -2319,7 +2319,7 @@ image:gremlin-sugar.png[width=120,float=left] In previous
versions of Gremlin-Gr
link:http://en.wikipedia.org/wiki/Syntactic_sugar[syntactic sugars] that users
could rely on to make their traversals
more succinct. Unfortunately, many of these conventions made use of
link:http://docs.oracle.com/javase/tutorial/reflect/[Java reflection]
and thus, were not performant. In TinkerPop, these conveniences have been
removed in support of the standard
-Gremlin-Groovy syntax being both inline with Gremlin-Java8 syntax as well as
always being the most performant
+Gremlin-Groovy syntax being both inline with Gremlin-Java syntax as well as
always being the most performant
representation. However, for those users that would like to use the previous
syntactic sugars (as well as new ones),
there is `SugarGremlinPlugin` (a.k.a Gremlin-Groovy-Sugar).
diff --git a/docs/src/reference/implementations-tinkergraph.asciidoc
b/docs/src/reference/implementations-tinkergraph.asciidoc
index e919bd4..8f6f8af 100644
--- a/docs/src/reference/implementations-tinkergraph.asciidoc
+++ b/docs/src/reference/implementations-tinkergraph.asciidoc
@@ -39,7 +39,7 @@ purposes.
* Use TinkerGraph as a sandbox to develop and debug complex traversals by
simulating data from a larger graph inside
a TinkerGraph.
-Constructing a simple graph using TinkerGraph in Java8 is presented below:
+Constructing a simple graph using TinkerGraph in Java is presented below:
[source,java]
----
diff --git a/docs/src/upgrade/appendix.asciidoc
b/docs/src/upgrade/appendix.asciidoc
index a9df0e4..7ce5b22 100644
--- a/docs/src/upgrade/appendix.asciidoc
+++ b/docs/src/upgrade/appendix.asciidoc
@@ -24,8 +24,8 @@ This section contains a few notes that reference differences
between TinkerPop 2
One of the major differences between TinkerPop 2.x and TinkerPop 3.x is that
in TinkerPop 3.x, the Java convention of
using setters and getters was abandoned in favor of a syntax that is more
aligned with the syntax of Gremlin-Groovy in
-TinkerPop2. Given that Gremlin-Java8 and Gremlin-Groovy are nearly identical
due to the inclusion of Java 8 lambdas, a
-big effort was made to ensure that both languages were as similar as possible.
+TinkerPop2. Given that Gremlin-Java and Gremlin-Groovy are nearly identical
due to the inclusion of lambdas from
+Java 8, a big effort was made to ensure that both languages were as similar as
possible.
In addition, TinkerPop2 and below made a sharp distinction between the various
TinkerPop projects: Blueprints, Pipes,
Gremlin, Frames, Furnace, and Rexster. With TinkerPop 3.x, all of these
projects have been merged and are generally
diff --git
a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/README.asciidoc
b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/README.asciidoc
index 49fd7c8..1471018 100644
---
a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/README.asciidoc
+++
b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/README.asciidoc
@@ -23,8 +23,8 @@ tests in `SocialDslTest` for actual DSL usage.
== Prerequisites
-* Java 8 Update 40+
-* link:https://maven.apache.org/[Maven 3.x]
+* Java 11
+* link:https://maven.apache.org/[Maven 3.3+]
== Building and Running
diff --git
a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
index d7bb31c..d50f5aa 100644
---
a/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
+++
b/gremlin-archetype/gremlin-archetype-dsl/src/main/resources/archetype-resources/pom.xml
@@ -49,13 +49,14 @@ limitations under the License.
<build>
<plugins>
<plugin>
- <!-- TinkerPop3 requires Java 8 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.8.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>11</release>
+ <compilerArgs>
+ <arg>-parameters</arg>
+ </compilerArgs>
</configuration>
</plugin>
</plugins>
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 d4a0eb1..9daafb2 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
@@ -24,8 +24,8 @@ distributed by TinkerPop.
== Prerequisites
-* Java 8 Update 40+
-* link:https://maven.apache.org/[Maven 3.x]
+* Java 11
+* link:https://maven.apache.org/[Maven 3.3+]
* Gremlin Server is link:http://archive.apache.org/dist/tinkerpop/[downloaded]
and unpackaged
== Building and Running
diff --git
a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
index ca29604..1e3254a 100644
---
a/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
+++
b/gremlin-archetype/gremlin-archetype-server/src/main/resources/archetype-resources/pom.xml
@@ -55,19 +55,20 @@ limitations under the License.
<build>
<plugins>
<plugin>
- <!-- TinkerPop3 requires Java 8 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.8.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>11</release>
+ <compilerArgs>
+ <arg>-parameters</arg>
+ </compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
+ <version>2.22.0</version>
<configuration>
<systemPropertyVariables>
<log4j.configuration>file:conf/log4j-test.properties</log4j.configuration>
diff --git
a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/README.asciidoc
b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/README.asciidoc
index ddb6de6..6535647 100644
---
a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/README.asciidoc
+++
b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/README.asciidoc
@@ -22,8 +22,8 @@ embedded graph database, loads it with some data and then
executes a shortest pa
== Prerequisites
-* Java 8 Update 40+
-* link:https://maven.apache.org/[Maven 3.x]
+* Java 11
+* link:https://maven.apache.org/[Maven 3.3+]
== Building and Running
diff --git
a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
index 0727319..06a840a 100644
---
a/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
+++
b/gremlin-archetype/gremlin-archetype-tinkergraph/src/main/resources/archetype-resources/pom.xml
@@ -49,13 +49,14 @@ limitations under the License.
<build>
<plugins>
<plugin>
- <!-- TinkerPop3 requires Java 8 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.8.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>11</release>
+ <compilerArgs>
+ <arg>-parameters</arg>
+ </compilerArgs>
</configuration>
</plugin>
</plugins>
diff --git
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
index 3e49c34..dd993c1 100644
---
a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
+++
b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/computer/TinkerMessenger.java
@@ -66,7 +66,7 @@ public final class TinkerMessenger<M> implements Messenger<M>
{
final MessageScope.Local<M> localMessageScope =
(MessageScope.Local<M>) messageScope;
final Traversal.Admin<Vertex, Edge> incidentTraversal =
TinkerMessenger.setVertexStart(localMessageScope.getIncidentTraversal().get().asAdmin(),
this.vertex);
final Direction direction =
TinkerMessenger.getDirection(incidentTraversal);
- final Edge[] edge = new Edge[1]; // simulates storage
side-effects available in Gremlin, but not Java8 streams
+ final Edge[] edge = new Edge[1]; // simulates storage
side-effects available in Gremlin, but not Java streams
multiIterator.addIterator(StreamSupport.stream(Spliterators.spliteratorUnknownSize(VertexProgramHelper.reverse(incidentTraversal.asAdmin()),
Spliterator.IMMUTABLE | Spliterator.SIZED), false)
.map((Edge e) -> {
edge[0] = e;
