You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2018/06/04 14:18:39 UTC
[01/42] tinkerpop git commit: Increase test timeout for slow systems
TINKERPOP-1897
Repository: tinkerpop
Updated Branches:
refs/heads/master 8dba8893a -> b0a68b8c0
refs/heads/tp32 1a0947b72 -> 6f6d9417a
refs/heads/tp33 f2e74ffb7 -> 31a3b444e
Increase test timeout for slow systems TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b8291539
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b8291539
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b8291539
Branch: refs/heads/master
Commit: b8291539c7b638f499fe184fd733f1973d408f7e
Parents: a5f1f74
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 1 17:17:11 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8291539/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index a7e6066..43442be 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -281,7 +281,7 @@ public class ResultQueueTest extends AbstractResultQueueTest {
latch.countDown();
});
- assertThat(latch.await(3000, TimeUnit.MILLISECONDS), is(true));
+ assertThat(latch.await(10000, TimeUnit.MILLISECONDS), is(true));
assertEquals(500, count1.get());
assertEquals(150, count2.get());
[19/42] tinkerpop git commit: Remove verbose log output TINKERPOP-1897
Posted by fl...@apache.org.
Remove verbose log output TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47f3c1cc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47f3c1cc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47f3c1cc
Branch: refs/heads/tp33
Commit: 47f3c1ccd697546ab2e5fd8d3c48904f53da1551
Parents: b829153
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
.../src/reference/gremlin-applications.asciidoc | 26 +-------------------
1 file changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47f3c1cc/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 80659af..e0896ef 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1946,31 +1946,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
-----oOOo-(3)-oOOo-----
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with report interval=180000ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report interval=180000ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo-stringd with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
-[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
[INFO] GremlinServer$1 - Channel started at port 8182.
----
[24/42] tinkerpop git commit: TINKERPOP-1897 Avoid pushing of Docker
images for SNAPSHOT versions
Posted by fl...@apache.org.
TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions
This also adds the minor version as an additional tag for Docker images
when the version is not a SNAPSHOT version.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9c3d0f00
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9c3d0f00
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9c3d0f00
Branch: refs/heads/tp33
Commit: 9c3d0f00fd77a80ba9f5df4eb49b850110adb4e7
Parents: 5d2faa2
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed Mar 14 22:41:55 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 61 +++++++++++++++++++++++++++++++++++++-------
gremlin-server/pom.xml | 53 ++++++++++++++++++++++++++++++++++----
pom.xml | 5 ++++
3 files changed, 105 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b7933fb..b24c772 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -347,23 +347,66 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<execution>
- <id>docker-image</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
+ <id>docker-image-build</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
+ </buildArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-tag-minor-version</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <tag>3.2</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-push</id>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>tinkerpop/gremlin-console</repository>
- <tag>${project.version}</tag>
- <buildArgs>
- <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
- </buildArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dfc6570..e71f79b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -255,23 +255,66 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<execution>
- <id>docker-image</id>
+ <id>docker-image-build</id>
<goals>
<goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+ </buildArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-tag-minor-version</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <tag>3.2</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-push</id>
+ <goals>
<goal>push</goal>
</goals>
+ <configuration>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>tinkerpop/gremlin-server</repository>
- <tag>${project.version}</tag>
- <buildArgs>
- <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
- </buildArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5251de3..19866f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,6 +502,11 @@ limitations under the License.
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.3.7</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[27/42] tinkerpop git commit: Remove .docker file activation option
for Maven TINKERPOP-1897
Posted by fl...@apache.org.
Remove .docker file activation option for Maven TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0efeb4a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0efeb4a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0efeb4a2
Branch: refs/heads/tp32
Commit: 0efeb4a27cb0630cf71165e19681720a8f33ee84
Parents: 80931ce
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 23 20:33:19 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
.gitignore | 1 -
docker/hadoop/Dockerfile | 25 ++++++++++++++++++++
docker/scripts/build.sh | 3 ---
.../developer/development-environment.asciidoc | 4 +---
gremlin-console/pom.xml | 6 -----
gremlin-server/pom.xml | 6 -----
pom.xml | 1 -
7 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 10e5b4f..0109f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ __pycache__/
*.py[cdo]
__version__.py
.glv
-.docker
settings.xml
tools/
[Dd]ebug/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/hadoop/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile
new file mode 100644
index 0000000..86b2598
--- /dev/null
+++ b/docker/hadoop/Dockerfile
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM tinkerpop:base
+
+MAINTAINER Daniel Kuppitz <me...@gremlin.guru>
+
+ENV HADOOP_VERSION 2.7.2
+
+COPY install.sh /usr/local/sbin/install-hadoop.sh
+RUN /usr/local/sbin/install-hadoop.sh
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 3d8f0d3..5ef74fc 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,9 +67,6 @@ touch gremlin-python/.glv
touch gremlin-dotnet/src/.glv
touch gremlin-dotnet/test/.glv
-rm gremlin-console/.docker
-rm gremlin-server/.docker
-
# use a custom maven settings.xml
if [ -r "settings.xml" ]; then
echo "Copying settings.xml"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index cb20d4e..ae97d1a 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -136,9 +136,7 @@ The Docker images can be built from the command line with:
----
mvn clean install -Pdocker-images
----
-which enables the "docker-images" Maven profile or in a more automated fashion simply add a `.docker` file to the
-directories of the `gremlin-server` and/or `gremlin-console` modules which will signify to Maven that Docker is present
-in the environment.
+which enables the "docker-images" Maven profile.
[[release-environment]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 8e8b357..b5dca0e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,12 +338,6 @@ limitations under the License.
<profile>
<id>docker-images</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <file>
- <exists>.docker</exists>
- </file>
- </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index b2c3435..e361c9e 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -246,12 +246,6 @@ limitations under the License.
<profile>
<id>docker-images</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <file>
- <exists>.docker</exists>
- </file>
- </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 398b931..f2484f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,7 +349,6 @@ limitations under the License.
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
<exclude>**/.glv</exclude>
- <exclude>**/.docker</exclude>
<exclude>bin/gremlin.sh</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
<exclude>**/Debug/**</exclude>
[28/42] tinkerpop git commit: Replace hardcoded version tags by
parsed version TINKERPOP-1897
Posted by fl...@apache.org.
Replace hardcoded version tags by parsed version TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c6ddeb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c6ddeb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c6ddeb
Branch: refs/heads/tp33
Commit: e3c6ddeb30956ed661386b00889bb6e3e0b3c99f
Parents: fd11517
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat May 19 11:27:57 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 10 +++++-----
gremlin-server/pom.xml | 10 +++++-----
pom.xml | 6 ++++++
3 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index db86d41..8e8b357 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -367,9 +367,9 @@ limitations under the License.
<goals>
<goal>tag</goal>
</goals>
- <configuration>
- <tag>3.2</tag>
- <skip>${only.when.is.snapshot.used}</skip>
+ <configuration>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
</configuration>
</execution>
<execution>
@@ -377,9 +377,9 @@ limitations under the License.
<goals>
<goal>push</goal>
</goals>
- <configuration>
+ <configuration>
<skip>${only.when.is.snapshot.used}</skip>
- </configuration>
+ </configuration>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index ef2e609..b2c3435 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -275,9 +275,9 @@ limitations under the License.
<goals>
<goal>tag</goal>
</goals>
- <configuration>
- <tag>3.2</tag>
- <skip>${only.when.is.snapshot.used}</skip>
+ <configuration>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
</configuration>
</execution>
<execution>
@@ -285,9 +285,9 @@ limitations under the License.
<goals>
<goal>push</goal>
</goals>
- <configuration>
+ <configuration>
<skip>${only.when.is.snapshot.used}</skip>
- </configuration>
+ </configuration>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ff3f3a..398b931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,12 @@ limitations under the License.
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
[30/42] tinkerpop git commit: Add description about Docker
credentials TINKERPOP-1897
Posted by fl...@apache.org.
Add description about Docker credentials TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d2faa27
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d2faa27
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d2faa27
Branch: refs/heads/master
Commit: 5d2faa2759417ce3a5b1749d573707308523d191
Parents: 47f3c1c
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d2faa27/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index cb19a65..c50b189 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,6 +197,11 @@ authentication information on the ~/.npmrc file. The easiest way to do that is t
must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with `mvn dockerfile:push`.
+
[[building-testing]]
== Building and Testing
[34/42] tinkerpop git commit: TINKERPOP-1897 Move snapshot detection
to root pom.xml
Posted by fl...@apache.org.
TINKERPOP-1897 Move snapshot detection to root pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd115177
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd115177
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd115177
Branch: refs/heads/master
Commit: fd115177f2c3ebe72adb308e4505a633dc49bbe7
Parents: c125fc9
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 25 +------------------------
gremlin-server/pom.xml | 25 +------------------------
pom.xml | 29 ++++++++++++++++++++++++-----
3 files changed, 26 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b24c772..db86d41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -345,30 +345,7 @@ limitations under the License.
</file>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
- <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
- to the project version otherwise -->
- <id>build-helper-regex-is-snapshot-used</id>
- <phase>validate</phase>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>only.when.is.snapshot.used</name>
- <value>${project.version}</value>
- <regex>.*-SNAPSHOT</regex>
- <replacement>true</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e71f79b..ef2e609 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -253,30 +253,7 @@ limitations under the License.
</file>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
- <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
- to the project version otherwise -->
- <id>build-helper-regex-is-snapshot-used</id>
- <phase>validate</phase>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>only.when.is.snapshot.used</name>
- <value>${project.version}</value>
- <regex>.*-SNAPSHOT</regex>
- <replacement>true</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 19866f0..9ff3f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,30 @@ limitations under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
@@ -502,11 +526,6 @@ limitations under the License.
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.3.7</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
[40/42] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by fl...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31a3b444
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31a3b444
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31a3b444
Branch: refs/heads/tp33
Commit: 31a3b444ec290b3868337edb664348efbbd567ee
Parents: f2e74ff 6f6d941
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Jun 4 16:05:04 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 16:05:04 2018 +0200
----------------------------------------------------------------------
.dockerignore | 2 +
CHANGELOG.asciidoc | 2 +-
docker/hadoop/Dockerfile | 25 ++++++++
.../developer/development-environment.asciidoc | 22 ++++++-
docs/src/dev/developer/release.asciidoc | 8 ++-
.../src/reference/gremlin-applications.asciidoc | 65 ++++++++++++++++++++
gremlin-console/Dockerfile | 31 ++++++++++
gremlin-console/pom.xml | 64 +++++++++++++++++++
.../src/main/docker/docker-entrypoint.sh | 24 ++++++++
.../gremlin/driver/ResultQueueTest.java | 2 +-
gremlin-server/Dockerfile | 35 +++++++++++
gremlin-server/pom.xml | 64 +++++++++++++++++++
.../src/main/docker/docker-entrypoint.sh | 31 ++++++++++
pom.xml | 35 +++++++++++
14 files changed, 406 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 26ec185,273e5c7..bf0875a
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -2080,9 -1930,42 +2112,42 @@@ $ curl -X POST -d "{\"gremlin\":\"divid
{"message":"Error encountered evaluating script: divideIt(8, 2)"}
----
-In the above REST-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
+In the above HTTP-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
immediately forget the script after execution. In this way, the function does not end up being globally available.
+ [[gremlin-server-docker-image]]
+ === Docker Image
+ The Gremlin Server can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
+
+ [source,text]
+ ----
+ $ docker run tinkerpop/gremlin-server:x.y.z
+ [INFO] GremlinServer -
+ \,,,/
+ (o o)
+ -----oOOo-(3)-oOOo-----
+
+ [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
+ ...
+ [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
+ [INFO] GremlinServer$1 - Channel started at port 8182.
+ ----
+
+ By default, Gremlin Server listens on port 8182. So that port needs to be exposed if it should be reachable on the host:
+
+ [source,bash]
+ ----
+ $ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z
+ ----
+
+ Arguments provided with `docker run` are forwarded to the script that starts Gremlin Server. This allows for example
+ to use an alternative config file:
+
+ [source,bash]
+ ----
+ $ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml
+ ----
+
[[gremlin-plugins]]
== Gremlin Plugins
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-console/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/pom.xml
----------------------------------------------------------------------
[14/42] tinkerpop git commit: Add clarification for Docker image
releases TINKERPOP-1897
Posted by fl...@apache.org.
Add clarification for Docker image releases TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80931cee
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80931cee
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80931cee
Branch: refs/heads/tp33
Commit: 80931cee80613c1f910f26c6ceeb25bcf796cd83
Parents: e3c6dde
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 23 18:30:53 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 8 +++++---
docs/src/dev/developer/release.asciidoc | 5 +++++
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index c50b189..cb20d4e 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,9 +197,11 @@ authentication information on the ~/.npmrc file. The easiest way to do that is t
must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
-Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires authentication information in the
-`~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
-credentials. This must be done only once. Afterwards, `docker push` can be used to push images to Docker Hub which will
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires an account that is a member of the TinkerPop
+organization. So if you don't already have an account on Docker Hub then create one and request that
+a PMC member adds your account to the TinkerPop organization. Afterwards, authentication information needs to be added to
+the `~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
+credentials. This must be done only once. Finally, `docker push` can be used to push images to Docker Hub which will
be done automatically on `mvn deploy` or it can be triggered manually with `mvn dockerfile:push`.
[[building-testing]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 473e842..7963004 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -233,6 +233,11 @@ for generating javadoc and without that the binary distributions won't contain t
.. `mvn deploy -pl gremlin-javascript -DskipTests -Dnpm`
. Review the GLV releases at link:https://pypi.org/project/gremlinpython/[PyPi],
link:https://www.nuget.org/packages/Gremlin.Net/[nuget] and link:https://www.npmjs.com/package/gremlin[npm]
+. Deploy the Docker images
+.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+. Review the deployed Docker images at link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
+and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
. `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`.
[23/42] tinkerpop git commit: TINKERPOP-1897 Small rewording
Posted by fl...@apache.org.
TINKERPOP-1897 Small rewording
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c125fc98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c125fc98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c125fc98
Branch: refs/heads/tp32
Commit: c125fc9892fb786466cc0754b51761eb1c982c7a
Parents: 9c3d0f0
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 15 00:00:07 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c125fc98/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index e0896ef..273e5c7 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1951,7 +1951,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
[INFO] GremlinServer$1 - Channel started at port 8182.
----
-By default, Gremlin Server listens on port 8182. So that port should be exposed if it should be reachable on the host:
+By default, Gremlin Server listens on port 8182. So that port needs to be exposed if it should be reachable on the host:
[source,bash]
----
[11/42] tinkerpop git commit: Add note to check Docker images before
a release TINKERPOP-1897
Posted by fl...@apache.org.
Add note to check Docker images before a release TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8232158e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8232158e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8232158e
Branch: refs/heads/tp33
Commit: 8232158eb51009ec0b434a4b46638c9149b14852
Parents: 0efeb4a
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 30 17:22:19 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8232158e/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 7963004..eef4e3f 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,8 @@ under release is protected. Tweaks to documentation and other odds and ends rela
during this period.
. At some point during the week:
.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`
-.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV pre-releases.
+.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -Pdocker-images`
+.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and Docker image pre-releases.
.. Review LICENSE and NOTICE files to make sure that no <<dependencies,changes are needed>>.
.. Review javadoc filters on the "Core API" docs to be sure nothing needs to change.
.. Review JIRA tickets in the release and ensure that:
[12/42] tinkerpop git commit: Replace hardcoded version tags by
parsed version TINKERPOP-1897
Posted by fl...@apache.org.
Replace hardcoded version tags by parsed version TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c6ddeb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c6ddeb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c6ddeb
Branch: refs/heads/tp32
Commit: e3c6ddeb30956ed661386b00889bb6e3e0b3c99f
Parents: fd11517
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat May 19 11:27:57 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 10 +++++-----
gremlin-server/pom.xml | 10 +++++-----
pom.xml | 6 ++++++
3 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index db86d41..8e8b357 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -367,9 +367,9 @@ limitations under the License.
<goals>
<goal>tag</goal>
</goals>
- <configuration>
- <tag>3.2</tag>
- <skip>${only.when.is.snapshot.used}</skip>
+ <configuration>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
</configuration>
</execution>
<execution>
@@ -377,9 +377,9 @@ limitations under the License.
<goals>
<goal>push</goal>
</goals>
- <configuration>
+ <configuration>
<skip>${only.when.is.snapshot.used}</skip>
- </configuration>
+ </configuration>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index ef2e609..b2c3435 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -275,9 +275,9 @@ limitations under the License.
<goals>
<goal>tag</goal>
</goals>
- <configuration>
- <tag>3.2</tag>
- <skip>${only.when.is.snapshot.used}</skip>
+ <configuration>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
</configuration>
</execution>
<execution>
@@ -285,9 +285,9 @@ limitations under the License.
<goals>
<goal>push</goal>
</goals>
- <configuration>
+ <configuration>
<skip>${only.when.is.snapshot.used}</skip>
- </configuration>
+ </configuration>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ff3f3a..398b931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,12 @@ limitations under the License.
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
[02/42] tinkerpop git commit: Don't build docker images in docker
build TINKERPOP-1897
Posted by fl...@apache.org.
Don't build docker images in docker build TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a5f1f74a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a5f1f74a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a5f1f74a
Branch: refs/heads/master
Commit: a5f1f74a42649275fa35157f9072b5aa5e7c7748
Parents: 5ac7816
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Feb 26 21:17:46 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
docker/scripts/build.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5f1f74a/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 5ef74fc..3d8f0d3 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,6 +67,9 @@ touch gremlin-python/.glv
touch gremlin-dotnet/src/.glv
touch gremlin-dotnet/test/.glv
+rm gremlin-console/.docker
+rm gremlin-server/.docker
+
# use a custom maven settings.xml
if [ -r "settings.xml" ]; then
echo "Copying settings.xml"
[37/42] tinkerpop git commit: TINKERPOP-1897 Added -D equivalent of
docker mvn profile and disabled jvm artifact deployment in that profile.
Posted by fl...@apache.org.
TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm artifact deployment in that profile.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f6d9417
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f6d9417
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f6d9417
Branch: refs/heads/tp32
Commit: 6f6d9417a4c938f42b8260b8bd5328d147106a0e
Parents: 8232158
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 4 09:26:22 2018 -0400
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:30 2018 +0200
----------------------------------------------------------------------
.../developer/development-environment.asciidoc | 9 +++++----
docs/src/dev/developer/release.asciidoc | 6 +++---
gremlin-console/pom.xml | 18 +++++++++++++++++-
gremlin-server/pom.xml | 18 +++++++++++++++++-
4 files changed, 42 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index ae97d1a..6b1dbd6 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -129,15 +129,16 @@ See the <<release-environment,Release Environment>> section for more information
[[docker-environment]]
=== Docker Environment
-The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console.
-The Docker images can be built from the command line with:
+The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console. The Docker images
+can be built from the command line with:
+
[source,text]
----
-mvn clean install -Pdocker-images
+mvn clean install -pl gremlin-server,gremlin-console -DdockerImages
----
-which enables the "docker-images" Maven profile.
+which enables the "docker-images" Maven profile.
[[release-environment]]
=== Release Environment
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index eef4e3f..5496b31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,7 @@ under release is protected. Tweaks to documentation and other odds and ends rela
during this period.
. At some point during the week:
.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`
-.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -Pdocker-images`
+.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -DdockerImages`
.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and Docker image pre-releases.
.. Review LICENSE and NOTICE files to make sure that no <<dependencies,changes are needed>>.
.. Review javadoc filters on the "Core API" docs to be sure nothing needs to change.
@@ -235,8 +235,8 @@ for generating javadoc and without that the binary distributions won't contain t
. Review the GLV releases at link:https://pypi.org/project/gremlinpython/[PyPi],
link:https://www.nuget.org/packages/Gremlin.Net/[nuget] and link:https://www.npmjs.com/package/gremlin[npm]
. Deploy the Docker images
-.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
-.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-console -DskipTests -DdockerImages`
+.. `mvn deploy -pl gremlin-server -DskipTests -DdockerImages`
. Review the deployed Docker images at link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; svn up dev/xx.yy.zz`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b5dca0e..748360c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,8 +338,24 @@ limitations under the License.
<profile>
<id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>dockerImages</name>
+ </property>
+ </activation>
<build>
- <plugins>
+ <plugins>
+ <!--
+ Deploying docker images will happen out of the normal jvm artifact deployment flow, so disable that
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e361c9e..0d68e7b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -246,8 +246,24 @@ limitations under the License.
<profile>
<id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>dockerImages</name>
+ </property>
+ </activation>
<build>
- <plugins>
+ <plugins>
+ <!--
+ Deploying docker images will happen out of the normal jvm artifact deployment flow, so disable that
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
[33/42] tinkerpop git commit: Remove .docker file activation option
for Maven TINKERPOP-1897
Posted by fl...@apache.org.
Remove .docker file activation option for Maven TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0efeb4a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0efeb4a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0efeb4a2
Branch: refs/heads/master
Commit: 0efeb4a27cb0630cf71165e19681720a8f33ee84
Parents: 80931ce
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 23 20:33:19 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
.gitignore | 1 -
docker/hadoop/Dockerfile | 25 ++++++++++++++++++++
docker/scripts/build.sh | 3 ---
.../developer/development-environment.asciidoc | 4 +---
gremlin-console/pom.xml | 6 -----
gremlin-server/pom.xml | 6 -----
pom.xml | 1 -
7 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 10e5b4f..0109f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ __pycache__/
*.py[cdo]
__version__.py
.glv
-.docker
settings.xml
tools/
[Dd]ebug/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/hadoop/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile
new file mode 100644
index 0000000..86b2598
--- /dev/null
+++ b/docker/hadoop/Dockerfile
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM tinkerpop:base
+
+MAINTAINER Daniel Kuppitz <me...@gremlin.guru>
+
+ENV HADOOP_VERSION 2.7.2
+
+COPY install.sh /usr/local/sbin/install-hadoop.sh
+RUN /usr/local/sbin/install-hadoop.sh
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 3d8f0d3..5ef74fc 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,9 +67,6 @@ touch gremlin-python/.glv
touch gremlin-dotnet/src/.glv
touch gremlin-dotnet/test/.glv
-rm gremlin-console/.docker
-rm gremlin-server/.docker
-
# use a custom maven settings.xml
if [ -r "settings.xml" ]; then
echo "Copying settings.xml"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index cb20d4e..ae97d1a 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -136,9 +136,7 @@ The Docker images can be built from the command line with:
----
mvn clean install -Pdocker-images
----
-which enables the "docker-images" Maven profile or in a more automated fashion simply add a `.docker` file to the
-directories of the `gremlin-server` and/or `gremlin-console` modules which will signify to Maven that Docker is present
-in the environment.
+which enables the "docker-images" Maven profile.
[[release-environment]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 8e8b357..b5dca0e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,12 +338,6 @@ limitations under the License.
<profile>
<id>docker-images</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <file>
- <exists>.docker</exists>
- </file>
- </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index b2c3435..e361c9e 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -246,12 +246,6 @@ limitations under the License.
<profile>
<id>docker-images</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <file>
- <exists>.docker</exists>
- </file>
- </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 398b931..f2484f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,7 +349,6 @@ limitations under the License.
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
<exclude>**/.glv</exclude>
- <exclude>**/.docker</exclude>
<exclude>bin/gremlin.sh</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
<exclude>**/Debug/**</exclude>
[18/42] tinkerpop git commit: Remove verbose log output TINKERPOP-1897
Posted by fl...@apache.org.
Remove verbose log output TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47f3c1cc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47f3c1cc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47f3c1cc
Branch: refs/heads/master
Commit: 47f3c1ccd697546ab2e5fd8d3c48904f53da1551
Parents: b829153
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
.../src/reference/gremlin-applications.asciidoc | 26 +-------------------
1 file changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47f3c1cc/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 80659af..e0896ef 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1946,31 +1946,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
-----oOOo-(3)-oOOo-----
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with report interval=180000ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report interval=180000ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo-stringd with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
-[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
[INFO] GremlinServer$1 - Channel started at port 8182.
----
[39/42] tinkerpop git commit: TINKERPOP-1897 Added -D equivalent of
docker mvn profile and disabled jvm artifact deployment in that profile.
Posted by fl...@apache.org.
TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm artifact deployment in that profile.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f6d9417
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f6d9417
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f6d9417
Branch: refs/heads/tp33
Commit: 6f6d9417a4c938f42b8260b8bd5328d147106a0e
Parents: 8232158
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 4 09:26:22 2018 -0400
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:30 2018 +0200
----------------------------------------------------------------------
.../developer/development-environment.asciidoc | 9 +++++----
docs/src/dev/developer/release.asciidoc | 6 +++---
gremlin-console/pom.xml | 18 +++++++++++++++++-
gremlin-server/pom.xml | 18 +++++++++++++++++-
4 files changed, 42 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index ae97d1a..6b1dbd6 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -129,15 +129,16 @@ See the <<release-environment,Release Environment>> section for more information
[[docker-environment]]
=== Docker Environment
-The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console.
-The Docker images can be built from the command line with:
+The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console. The Docker images
+can be built from the command line with:
+
[source,text]
----
-mvn clean install -Pdocker-images
+mvn clean install -pl gremlin-server,gremlin-console -DdockerImages
----
-which enables the "docker-images" Maven profile.
+which enables the "docker-images" Maven profile.
[[release-environment]]
=== Release Environment
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index eef4e3f..5496b31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,7 @@ under release is protected. Tweaks to documentation and other odds and ends rela
during this period.
. At some point during the week:
.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`
-.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -Pdocker-images`
+.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -DdockerImages`
.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and Docker image pre-releases.
.. Review LICENSE and NOTICE files to make sure that no <<dependencies,changes are needed>>.
.. Review javadoc filters on the "Core API" docs to be sure nothing needs to change.
@@ -235,8 +235,8 @@ for generating javadoc and without that the binary distributions won't contain t
. Review the GLV releases at link:https://pypi.org/project/gremlinpython/[PyPi],
link:https://www.nuget.org/packages/Gremlin.Net/[nuget] and link:https://www.npmjs.com/package/gremlin[npm]
. Deploy the Docker images
-.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
-.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-console -DskipTests -DdockerImages`
+.. `mvn deploy -pl gremlin-server -DskipTests -DdockerImages`
. Review the deployed Docker images at link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; svn up dev/xx.yy.zz`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b5dca0e..748360c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,8 +338,24 @@ limitations under the License.
<profile>
<id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>dockerImages</name>
+ </property>
+ </activation>
<build>
- <plugins>
+ <plugins>
+ <!--
+ Deploying docker images will happen out of the normal jvm artifact deployment flow, so disable that
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e361c9e..0d68e7b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -246,8 +246,24 @@ limitations under the License.
<profile>
<id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>dockerImages</name>
+ </property>
+ </activation>
<build>
- <plugins>
+ <plugins>
+ <!--
+ Deploying docker images will happen out of the normal jvm artifact deployment flow, so disable that
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
[15/42] tinkerpop git commit: Replace hardcoded version tags by
parsed version TINKERPOP-1897
Posted by fl...@apache.org.
Replace hardcoded version tags by parsed version TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c6ddeb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c6ddeb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c6ddeb
Branch: refs/heads/master
Commit: e3c6ddeb30956ed661386b00889bb6e3e0b3c99f
Parents: fd11517
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sat May 19 11:27:57 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 10 +++++-----
gremlin-server/pom.xml | 10 +++++-----
pom.xml | 6 ++++++
3 files changed, 16 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index db86d41..8e8b357 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -367,9 +367,9 @@ limitations under the License.
<goals>
<goal>tag</goal>
</goals>
- <configuration>
- <tag>3.2</tag>
- <skip>${only.when.is.snapshot.used}</skip>
+ <configuration>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
</configuration>
</execution>
<execution>
@@ -377,9 +377,9 @@ limitations under the License.
<goals>
<goal>push</goal>
</goals>
- <configuration>
+ <configuration>
<skip>${only.when.is.snapshot.used}</skip>
- </configuration>
+ </configuration>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index ef2e609..b2c3435 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -275,9 +275,9 @@ limitations under the License.
<goals>
<goal>tag</goal>
</goals>
- <configuration>
- <tag>3.2</tag>
- <skip>${only.when.is.snapshot.used}</skip>
+ <configuration>
+ <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
</configuration>
</execution>
<execution>
@@ -285,9 +285,9 @@ limitations under the License.
<goals>
<goal>push</goal>
</goals>
- <configuration>
+ <configuration>
<skip>${only.when.is.snapshot.used}</skip>
- </configuration>
+ </configuration>
</execution>
</executions>
<configuration>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ff3f3a..398b931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,12 @@ limitations under the License.
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
[17/42] tinkerpop git commit: Add clarification for Docker image
releases TINKERPOP-1897
Posted by fl...@apache.org.
Add clarification for Docker image releases TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80931cee
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80931cee
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80931cee
Branch: refs/heads/master
Commit: 80931cee80613c1f910f26c6ceeb25bcf796cd83
Parents: e3c6dde
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 23 18:30:53 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 8 +++++---
docs/src/dev/developer/release.asciidoc | 5 +++++
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index c50b189..cb20d4e 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,9 +197,11 @@ authentication information on the ~/.npmrc file. The easiest way to do that is t
must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
-Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires authentication information in the
-`~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
-credentials. This must be done only once. Afterwards, `docker push` can be used to push images to Docker Hub which will
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires an account that is a member of the TinkerPop
+organization. So if you don't already have an account on Docker Hub then create one and request that
+a PMC member adds your account to the TinkerPop organization. Afterwards, authentication information needs to be added to
+the `~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
+credentials. This must be done only once. Finally, `docker push` can be used to push images to Docker Hub which will
be done automatically on `mvn deploy` or it can be triggered manually with `mvn dockerfile:push`.
[[building-testing]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 473e842..7963004 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -233,6 +233,11 @@ for generating javadoc and without that the binary distributions won't contain t
.. `mvn deploy -pl gremlin-javascript -DskipTests -Dnpm`
. Review the GLV releases at link:https://pypi.org/project/gremlinpython/[PyPi],
link:https://www.nuget.org/packages/Gremlin.Net/[nuget] and link:https://www.npmjs.com/package/gremlin[npm]
+. Deploy the Docker images
+.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+. Review the deployed Docker images at link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
+and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
. `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`.
[03/42] tinkerpop git commit: Add docker images for console and
server TINKERPOP-1897
Posted by fl...@apache.org.
Add docker images for console and server TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ac78169
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ac78169
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ac78169
Branch: refs/heads/master
Commit: 5ac78169ccd7c6674343204fa22e1af83d2fddcc
Parents: 1a0947b
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Feb 25 18:14:03 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
.dockerignore | 2 +
.gitignore | 1 +
CHANGELOG.asciidoc | 2 +-
.../developer/development-environment.asciidoc | 16 +++-
.../src/reference/gremlin-applications.asciidoc | 89 ++++++++++++++++++++
gremlin-console/Dockerfile | 31 +++++++
gremlin-console/pom.xml | 34 ++++++++
.../src/main/docker/docker-entrypoint.sh | 24 ++++++
gremlin-server/Dockerfile | 35 ++++++++
gremlin-server/pom.xml | 34 ++++++++
.../src/main/docker/docker-entrypoint.sh | 31 +++++++
pom.xml | 6 ++
12 files changed, 303 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.dockerignore
----------------------------------------------------------------------
diff --git a/.dockerignore b/.dockerignore
index afe0e54..50d6801 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
**/*.log
**/target
+!gremlin-server/target/apache-tinkerpop-gremlin-server-*
+!gremlin-console/target/apache-tinkerpop-gremlin-console-*
*.iml
.idea
**/*.DS_Store
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0109f82..10e5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ __pycache__/
*.py[cdo]
__version__.py
.glv
+.docker
settings.xml
tools/
[Dd]ebug/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6297210..a1d0963 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Added Docker images for Gremlin Console and Gremlin Server
* Fixed bug in `branch()` where reducing steps as options would produce incorrect results.
* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
* Improved performance of `TraversalVertexProgram` and related infrastructure.
@@ -56,7 +57,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* TINKERPOP-1950 Traversal construction performance enhancements
* TINKERPOP-1953 Bump to Groovy 2.4.15
-
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 4dfbcaa..cb19a65 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -106,7 +106,7 @@ The build optionally requires link:https://www.microsoft.com/net/core[.NET Core
`gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will still build with Maven, but .NET projects
will be skipped.
-`gremlin-dotnet` can be build and tested from the command line with:
+`gremlin-dotnet` can be built and tested from the command line with:
[source,text]
mvn clean install -Pgremlin-dotnet
@@ -127,6 +127,20 @@ other existing Node.js runtime instances in your machine.
See the <<release-environment,Release Environment>> section for more information on release manager configurations.
+[[docker-environment]]
+=== Docker Environment
+The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console.
+
+The Docker images can be built from the command line with:
+[source,text]
+----
+mvn clean install -Pdocker-images
+----
+which enables the "docker-images" Maven profile or in a more automated fashion simply add a `.docker` file to the
+directories of the `gremlin-server` and/or `gremlin-console` modules which will signify to Maven that Docker is present
+in the environment.
+
+
[[release-environment]]
=== Release Environment
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 522bcfd..80659af 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -353,6 +353,38 @@ variable initialization code into the console.
Like, execution mode, it is also possible to pass multiple scripts by specifying multiple `-i` options. See the
<<execution-mode, Execution Mode Section>> for more information on the specifics of that capability.
+[[gremlin-console-docker-image]]
+=== Docker Image
+The Gremlin Console can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
+
+[source,text]
+----
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+Feb 25, 2018 3:47:24 PM java.util.prefs.FileSystemPreferences$1 run
+INFO: Created user preferences directory.
+
+ \,,,/
+ (o o)
+-----oOOo-(3)-oOOo-----
+plugin activated: tinkerpop.server
+plugin activated: tinkerpop.utilities
+plugin activated: tinkerpop.tinkergraph
+gremlin>
+----
+
+The Docker image offers the same options as the standalone Console. It can be used for example to execute scripts:
+
+[source,bash]
+----
+$ docker run -it tinkerpop/gremlin-console:x.y.z -e gremlin.groovy
+v[1]
+v[2]
+v[3]
+v[4]
+v[5]
+v[6]
+----
+
[[gremlin-server]]
== Gremlin Server
@@ -1901,6 +1933,63 @@ $ curl -X POST -d "{\"gremlin\":\"divideIt(8, 2)\"}" "http://localhost:8182"
In the above REST-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
immediately forget the script after execution. In this way, the function does not end up being globally available.
+[[gremlin-server-docker-image]]
+=== Docker Image
+The Gremlin Server can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
+
+[source,text]
+----
+$ docker run tinkerpop/gremlin-server:x.y.z
+[INFO] GremlinServer -
+ \,,,/
+ (o o)
+-----oOOo-(3)-oOOo-----
+
+[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
+[INFO] MetricManager - Configured Metrics ConsoleReporter configured with report interval=180000ms
+[INFO] MetricManager - Configured Metrics CsvReporter configured with report interval=180000ms to fileName=/tmp/gremlin-server-metrics.csv
+[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= and agentId=
+[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
+[INFO] DefaultGraphManager - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
+[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
+[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
+[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/empty-sample.groovy
+[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
+[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
+[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
+[INFO] OpLoader - Adding the standard OpProcessor.
+[INFO] OpLoader - Adding the control OpProcessor.
+[INFO] OpLoader - Adding the session OpProcessor.
+[INFO] OpLoader - Adding the traversal OpProcessor.
+[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
+[INFO] GremlinServer - Executing start up LifeCycleHook
+[INFO] Logger$info - Executed once at startup of Gremlin Server.
+[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
+[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo-stringd with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
+[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
+[INFO] GremlinServer$1 - Channel started at port 8182.
+----
+
+By default, Gremlin Server listens on port 8182. So that port should be exposed if it should be reachable on the host:
+
+[source,bash]
+----
+$ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z
+----
+
+Arguments provided with `docker run` are forwarded to the script that starts Gremlin Server. This allows for example
+to use an alternative config file:
+
+[source,bash]
+----
+$ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml
+----
+
[[gremlin-plugins]]
== Gremlin Plugins
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/Dockerfile
----------------------------------------------------------------------
diff --git a/gremlin-console/Dockerfile b/gremlin-console/Dockerfile
new file mode 100644
index 0000000..909952f
--- /dev/null
+++ b/gremlin-console/Dockerfile
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM openjdk:8u151-jre-alpine3.7
+
+ARG GREMLIN_CONSOLE_DIR
+
+RUN apk add --update \
+ bash \
+ && rm -rf /var/cache/apk/*
+
+COPY src/main/docker/docker-entrypoint.sh /
+COPY ${GREMLIN_CONSOLE_DIR} /opt/gremlin-console
+
+WORKDIR /opt/gremlin-console
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 49e7f4a..b7933fb 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -335,5 +335,39 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>.docker</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docker-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>tinkerpop/gremlin-console</repository>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/src/main/docker/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/docker/docker-entrypoint.sh b/gremlin-console/src/main/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..2c8d204
--- /dev/null
+++ b/gremlin-console/src/main/docker/docker-entrypoint.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -e
+
+exec /opt/gremlin-console/bin/gremlin.sh "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/Dockerfile
----------------------------------------------------------------------
diff --git a/gremlin-server/Dockerfile b/gremlin-server/Dockerfile
new file mode 100644
index 0000000..c47e0cf
--- /dev/null
+++ b/gremlin-server/Dockerfile
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM openjdk:8u151-jre-alpine3.7
+
+ARG GREMLIN_SERVER_DIR
+
+RUN apk add --update \
+ bash \
+ perl \
+ && rm -rf /var/cache/apk/*
+
+COPY src/main/docker/docker-entrypoint.sh /
+COPY ${GREMLIN_SERVER_DIR} /opt/gremlin-server
+
+WORKDIR /opt/gremlin-server
+
+EXPOSE 8182
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["conf/gremlin-server.yaml"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 68733a9..dfc6570 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -243,5 +243,39 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>.docker</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docker-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>tinkerpop/gremlin-server</repository>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/src/main/docker/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/docker/docker-entrypoint.sh b/gremlin-server/src/main/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..d869b8c
--- /dev/null
+++ b/gremlin-server/src/main/docker/docker-entrypoint.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -e
+
+CONF_FILE=$1
+
+# IP substitution hack borrowed from:
+# https://github.com/htaox/NEAT/blob/94a004831cf89767e116d955192fc14ac82e5069/docker-scripts/gremlin-server-3.0.0/files/default_cmd#L5
+IP=$(ip -o -4 addr list eth0 | perl -n -e 'if (m{inet\s([\d\.]+)\/\d+\s}xms) { print $1 }')
+sed -i "s|^host:.*|host: $IP|" $CONF_FILE
+
+exec /opt/gremlin-server/bin/gremlin-server.sh "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c4b507..5251de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,7 @@ limitations under the License.
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
<exclude>**/.glv</exclude>
+ <exclude>**/.docker</exclude>
<exclude>bin/gremlin.sh</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
<exclude>**/Debug/**</exclude>
@@ -496,6 +497,11 @@ limitations under the License.
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.3.7</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[31/42] tinkerpop git commit: TINKERPOP-1897 Avoid pushing of Docker
images for SNAPSHOT versions
Posted by fl...@apache.org.
TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions
This also adds the minor version as an additional tag for Docker images
when the version is not a SNAPSHOT version.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9c3d0f00
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9c3d0f00
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9c3d0f00
Branch: refs/heads/tp32
Commit: 9c3d0f00fd77a80ba9f5df4eb49b850110adb4e7
Parents: 5d2faa2
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed Mar 14 22:41:55 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 61 +++++++++++++++++++++++++++++++++++++-------
gremlin-server/pom.xml | 53 ++++++++++++++++++++++++++++++++++----
pom.xml | 5 ++++
3 files changed, 105 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b7933fb..b24c772 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -347,23 +347,66 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<execution>
- <id>docker-image</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
+ <id>docker-image-build</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
+ </buildArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-tag-minor-version</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <tag>3.2</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-push</id>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>tinkerpop/gremlin-console</repository>
- <tag>${project.version}</tag>
- <buildArgs>
- <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
- </buildArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dfc6570..e71f79b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -255,23 +255,66 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<execution>
- <id>docker-image</id>
+ <id>docker-image-build</id>
<goals>
<goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+ </buildArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-tag-minor-version</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <tag>3.2</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-push</id>
+ <goals>
<goal>push</goal>
</goals>
+ <configuration>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>tinkerpop/gremlin-server</repository>
- <tag>${project.version}</tag>
- <buildArgs>
- <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
- </buildArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5251de3..19866f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,6 +502,11 @@ limitations under the License.
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.3.7</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[06/42] tinkerpop git commit: Don't build docker images in docker
build TINKERPOP-1897
Posted by fl...@apache.org.
Don't build docker images in docker build TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a5f1f74a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a5f1f74a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a5f1f74a
Branch: refs/heads/tp32
Commit: a5f1f74a42649275fa35157f9072b5aa5e7c7748
Parents: 5ac7816
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Feb 26 21:17:46 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
docker/scripts/build.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5f1f74a/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 5ef74fc..3d8f0d3 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,6 +67,9 @@ touch gremlin-python/.glv
touch gremlin-dotnet/src/.glv
touch gremlin-dotnet/test/.glv
+rm gremlin-console/.docker
+rm gremlin-server/.docker
+
# use a custom maven settings.xml
if [ -r "settings.xml" ]; then
echo "Copying settings.xml"
[35/42] tinkerpop git commit: TINKERPOP-1897 Small rewording
Posted by fl...@apache.org.
TINKERPOP-1897 Small rewording
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c125fc98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c125fc98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c125fc98
Branch: refs/heads/master
Commit: c125fc9892fb786466cc0754b51761eb1c982c7a
Parents: 9c3d0f0
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 15 00:00:07 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c125fc98/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index e0896ef..273e5c7 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1951,7 +1951,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
[INFO] GremlinServer$1 - Channel started at port 8182.
----
-By default, Gremlin Server listens on port 8182. So that port should be exposed if it should be reachable on the host:
+By default, Gremlin Server listens on port 8182. So that port needs to be exposed if it should be reachable on the host:
[source,bash]
----
[32/42] tinkerpop git commit: TINKERPOP-1897 Small rewording
Posted by fl...@apache.org.
TINKERPOP-1897 Small rewording
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c125fc98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c125fc98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c125fc98
Branch: refs/heads/tp33
Commit: c125fc9892fb786466cc0754b51761eb1c982c7a
Parents: 9c3d0f0
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 15 00:00:07 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c125fc98/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index e0896ef..273e5c7 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1951,7 +1951,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
[INFO] GremlinServer$1 - Channel started at port 8182.
----
-By default, Gremlin Server listens on port 8182. So that port should be exposed if it should be reachable on the host:
+By default, Gremlin Server listens on port 8182. So that port needs to be exposed if it should be reachable on the host:
[source,bash]
----
[26/42] tinkerpop git commit: Add clarification for Docker image
releases TINKERPOP-1897
Posted by fl...@apache.org.
Add clarification for Docker image releases TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80931cee
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80931cee
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80931cee
Branch: refs/heads/tp32
Commit: 80931cee80613c1f910f26c6ceeb25bcf796cd83
Parents: e3c6dde
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 23 18:30:53 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 8 +++++---
docs/src/dev/developer/release.asciidoc | 5 +++++
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index c50b189..cb20d4e 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,9 +197,11 @@ authentication information on the ~/.npmrc file. The easiest way to do that is t
must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
-Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires authentication information in the
-`~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
-credentials. This must be done only once. Afterwards, `docker push` can be used to push images to Docker Hub which will
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires an account that is a member of the TinkerPop
+organization. So if you don't already have an account on Docker Hub then create one and request that
+a PMC member adds your account to the TinkerPop organization. Afterwards, authentication information needs to be added to
+the `~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
+credentials. This must be done only once. Finally, `docker push` can be used to push images to Docker Hub which will
be done automatically on `mvn deploy` or it can be triggered manually with `mvn dockerfile:push`.
[[building-testing]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 473e842..7963004 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -233,6 +233,11 @@ for generating javadoc and without that the binary distributions won't contain t
.. `mvn deploy -pl gremlin-javascript -DskipTests -Dnpm`
. Review the GLV releases at link:https://pypi.org/project/gremlinpython/[PyPi],
link:https://www.nuget.org/packages/Gremlin.Net/[nuget] and link:https://www.npmjs.com/package/gremlin[npm]
+. Deploy the Docker images
+.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+. Review the deployed Docker images at link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
+and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
. `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`.
[09/42] tinkerpop git commit: Add docker images for console and
server TINKERPOP-1897
Posted by fl...@apache.org.
Add docker images for console and server TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ac78169
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ac78169
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ac78169
Branch: refs/heads/tp33
Commit: 5ac78169ccd7c6674343204fa22e1af83d2fddcc
Parents: 1a0947b
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Feb 25 18:14:03 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
.dockerignore | 2 +
.gitignore | 1 +
CHANGELOG.asciidoc | 2 +-
.../developer/development-environment.asciidoc | 16 +++-
.../src/reference/gremlin-applications.asciidoc | 89 ++++++++++++++++++++
gremlin-console/Dockerfile | 31 +++++++
gremlin-console/pom.xml | 34 ++++++++
.../src/main/docker/docker-entrypoint.sh | 24 ++++++
gremlin-server/Dockerfile | 35 ++++++++
gremlin-server/pom.xml | 34 ++++++++
.../src/main/docker/docker-entrypoint.sh | 31 +++++++
pom.xml | 6 ++
12 files changed, 303 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.dockerignore
----------------------------------------------------------------------
diff --git a/.dockerignore b/.dockerignore
index afe0e54..50d6801 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
**/*.log
**/target
+!gremlin-server/target/apache-tinkerpop-gremlin-server-*
+!gremlin-console/target/apache-tinkerpop-gremlin-console-*
*.iml
.idea
**/*.DS_Store
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0109f82..10e5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ __pycache__/
*.py[cdo]
__version__.py
.glv
+.docker
settings.xml
tools/
[Dd]ebug/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6297210..a1d0963 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Added Docker images for Gremlin Console and Gremlin Server
* Fixed bug in `branch()` where reducing steps as options would produce incorrect results.
* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
* Improved performance of `TraversalVertexProgram` and related infrastructure.
@@ -56,7 +57,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* TINKERPOP-1950 Traversal construction performance enhancements
* TINKERPOP-1953 Bump to Groovy 2.4.15
-
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 4dfbcaa..cb19a65 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -106,7 +106,7 @@ The build optionally requires link:https://www.microsoft.com/net/core[.NET Core
`gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will still build with Maven, but .NET projects
will be skipped.
-`gremlin-dotnet` can be build and tested from the command line with:
+`gremlin-dotnet` can be built and tested from the command line with:
[source,text]
mvn clean install -Pgremlin-dotnet
@@ -127,6 +127,20 @@ other existing Node.js runtime instances in your machine.
See the <<release-environment,Release Environment>> section for more information on release manager configurations.
+[[docker-environment]]
+=== Docker Environment
+The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console.
+
+The Docker images can be built from the command line with:
+[source,text]
+----
+mvn clean install -Pdocker-images
+----
+which enables the "docker-images" Maven profile or in a more automated fashion simply add a `.docker` file to the
+directories of the `gremlin-server` and/or `gremlin-console` modules which will signify to Maven that Docker is present
+in the environment.
+
+
[[release-environment]]
=== Release Environment
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 522bcfd..80659af 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -353,6 +353,38 @@ variable initialization code into the console.
Like, execution mode, it is also possible to pass multiple scripts by specifying multiple `-i` options. See the
<<execution-mode, Execution Mode Section>> for more information on the specifics of that capability.
+[[gremlin-console-docker-image]]
+=== Docker Image
+The Gremlin Console can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
+
+[source,text]
+----
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+Feb 25, 2018 3:47:24 PM java.util.prefs.FileSystemPreferences$1 run
+INFO: Created user preferences directory.
+
+ \,,,/
+ (o o)
+-----oOOo-(3)-oOOo-----
+plugin activated: tinkerpop.server
+plugin activated: tinkerpop.utilities
+plugin activated: tinkerpop.tinkergraph
+gremlin>
+----
+
+The Docker image offers the same options as the standalone Console. It can be used for example to execute scripts:
+
+[source,bash]
+----
+$ docker run -it tinkerpop/gremlin-console:x.y.z -e gremlin.groovy
+v[1]
+v[2]
+v[3]
+v[4]
+v[5]
+v[6]
+----
+
[[gremlin-server]]
== Gremlin Server
@@ -1901,6 +1933,63 @@ $ curl -X POST -d "{\"gremlin\":\"divideIt(8, 2)\"}" "http://localhost:8182"
In the above REST-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
immediately forget the script after execution. In this way, the function does not end up being globally available.
+[[gremlin-server-docker-image]]
+=== Docker Image
+The Gremlin Server can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
+
+[source,text]
+----
+$ docker run tinkerpop/gremlin-server:x.y.z
+[INFO] GremlinServer -
+ \,,,/
+ (o o)
+-----oOOo-(3)-oOOo-----
+
+[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
+[INFO] MetricManager - Configured Metrics ConsoleReporter configured with report interval=180000ms
+[INFO] MetricManager - Configured Metrics CsvReporter configured with report interval=180000ms to fileName=/tmp/gremlin-server-metrics.csv
+[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= and agentId=
+[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
+[INFO] DefaultGraphManager - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
+[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
+[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
+[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/empty-sample.groovy
+[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
+[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
+[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
+[INFO] OpLoader - Adding the standard OpProcessor.
+[INFO] OpLoader - Adding the control OpProcessor.
+[INFO] OpLoader - Adding the session OpProcessor.
+[INFO] OpLoader - Adding the traversal OpProcessor.
+[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
+[INFO] GremlinServer - Executing start up LifeCycleHook
+[INFO] Logger$info - Executed once at startup of Gremlin Server.
+[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
+[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo-stringd with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
+[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
+[INFO] GremlinServer$1 - Channel started at port 8182.
+----
+
+By default, Gremlin Server listens on port 8182. So that port should be exposed if it should be reachable on the host:
+
+[source,bash]
+----
+$ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z
+----
+
+Arguments provided with `docker run` are forwarded to the script that starts Gremlin Server. This allows for example
+to use an alternative config file:
+
+[source,bash]
+----
+$ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml
+----
+
[[gremlin-plugins]]
== Gremlin Plugins
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/Dockerfile
----------------------------------------------------------------------
diff --git a/gremlin-console/Dockerfile b/gremlin-console/Dockerfile
new file mode 100644
index 0000000..909952f
--- /dev/null
+++ b/gremlin-console/Dockerfile
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM openjdk:8u151-jre-alpine3.7
+
+ARG GREMLIN_CONSOLE_DIR
+
+RUN apk add --update \
+ bash \
+ && rm -rf /var/cache/apk/*
+
+COPY src/main/docker/docker-entrypoint.sh /
+COPY ${GREMLIN_CONSOLE_DIR} /opt/gremlin-console
+
+WORKDIR /opt/gremlin-console
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 49e7f4a..b7933fb 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -335,5 +335,39 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>.docker</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docker-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>tinkerpop/gremlin-console</repository>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/src/main/docker/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/docker/docker-entrypoint.sh b/gremlin-console/src/main/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..2c8d204
--- /dev/null
+++ b/gremlin-console/src/main/docker/docker-entrypoint.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -e
+
+exec /opt/gremlin-console/bin/gremlin.sh "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/Dockerfile
----------------------------------------------------------------------
diff --git a/gremlin-server/Dockerfile b/gremlin-server/Dockerfile
new file mode 100644
index 0000000..c47e0cf
--- /dev/null
+++ b/gremlin-server/Dockerfile
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM openjdk:8u151-jre-alpine3.7
+
+ARG GREMLIN_SERVER_DIR
+
+RUN apk add --update \
+ bash \
+ perl \
+ && rm -rf /var/cache/apk/*
+
+COPY src/main/docker/docker-entrypoint.sh /
+COPY ${GREMLIN_SERVER_DIR} /opt/gremlin-server
+
+WORKDIR /opt/gremlin-server
+
+EXPOSE 8182
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["conf/gremlin-server.yaml"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 68733a9..dfc6570 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -243,5 +243,39 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>.docker</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docker-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>tinkerpop/gremlin-server</repository>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/src/main/docker/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/docker/docker-entrypoint.sh b/gremlin-server/src/main/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..d869b8c
--- /dev/null
+++ b/gremlin-server/src/main/docker/docker-entrypoint.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -e
+
+CONF_FILE=$1
+
+# IP substitution hack borrowed from:
+# https://github.com/htaox/NEAT/blob/94a004831cf89767e116d955192fc14ac82e5069/docker-scripts/gremlin-server-3.0.0/files/default_cmd#L5
+IP=$(ip -o -4 addr list eth0 | perl -n -e 'if (m{inet\s([\d\.]+)\/\d+\s}xms) { print $1 }')
+sed -i "s|^host:.*|host: $IP|" $CONF_FILE
+
+exec /opt/gremlin-server/bin/gremlin-server.sh "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c4b507..5251de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,7 @@ limitations under the License.
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
<exclude>**/.glv</exclude>
+ <exclude>**/.docker</exclude>
<exclude>bin/gremlin.sh</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
<exclude>**/Debug/**</exclude>
@@ -496,6 +497,11 @@ limitations under the License.
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.3.7</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[08/42] tinkerpop git commit: Don't build docker images in docker
build TINKERPOP-1897
Posted by fl...@apache.org.
Don't build docker images in docker build TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a5f1f74a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a5f1f74a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a5f1f74a
Branch: refs/heads/tp33
Commit: a5f1f74a42649275fa35157f9072b5aa5e7c7748
Parents: 5ac7816
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Feb 26 21:17:46 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
docker/scripts/build.sh | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5f1f74a/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 5ef74fc..3d8f0d3 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,6 +67,9 @@ touch gremlin-python/.glv
touch gremlin-dotnet/src/.glv
touch gremlin-dotnet/test/.glv
+rm gremlin-console/.docker
+rm gremlin-server/.docker
+
# use a custom maven settings.xml
if [ -r "settings.xml" ]; then
echo "Copying settings.xml"
[05/42] tinkerpop git commit: Increase test timeout for slow systems
TINKERPOP-1897
Posted by fl...@apache.org.
Increase test timeout for slow systems TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b8291539
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b8291539
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b8291539
Branch: refs/heads/tp32
Commit: b8291539c7b638f499fe184fd733f1973d408f7e
Parents: a5f1f74
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 1 17:17:11 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8291539/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index a7e6066..43442be 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -281,7 +281,7 @@ public class ResultQueueTest extends AbstractResultQueueTest {
latch.countDown();
});
- assertThat(latch.await(3000, TimeUnit.MILLISECONDS), is(true));
+ assertThat(latch.await(10000, TimeUnit.MILLISECONDS), is(true));
assertEquals(500, count1.get());
assertEquals(150, count2.get());
[04/42] tinkerpop git commit: Add docker images for console and
server TINKERPOP-1897
Posted by fl...@apache.org.
Add docker images for console and server TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ac78169
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ac78169
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ac78169
Branch: refs/heads/tp32
Commit: 5ac78169ccd7c6674343204fa22e1af83d2fddcc
Parents: 1a0947b
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Feb 25 18:14:03 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
.dockerignore | 2 +
.gitignore | 1 +
CHANGELOG.asciidoc | 2 +-
.../developer/development-environment.asciidoc | 16 +++-
.../src/reference/gremlin-applications.asciidoc | 89 ++++++++++++++++++++
gremlin-console/Dockerfile | 31 +++++++
gremlin-console/pom.xml | 34 ++++++++
.../src/main/docker/docker-entrypoint.sh | 24 ++++++
gremlin-server/Dockerfile | 35 ++++++++
gremlin-server/pom.xml | 34 ++++++++
.../src/main/docker/docker-entrypoint.sh | 31 +++++++
pom.xml | 6 ++
12 files changed, 303 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.dockerignore
----------------------------------------------------------------------
diff --git a/.dockerignore b/.dockerignore
index afe0e54..50d6801 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
**/*.log
**/target
+!gremlin-server/target/apache-tinkerpop-gremlin-server-*
+!gremlin-console/target/apache-tinkerpop-gremlin-console-*
*.iml
.idea
**/*.DS_Store
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0109f82..10e5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ __pycache__/
*.py[cdo]
__version__.py
.glv
+.docker
settings.xml
tools/
[Dd]ebug/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6297210..a1d0963 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Added Docker images for Gremlin Console and Gremlin Server
* Fixed bug in `branch()` where reducing steps as options would produce incorrect results.
* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
* Improved performance of `TraversalVertexProgram` and related infrastructure.
@@ -56,7 +57,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* TINKERPOP-1950 Traversal construction performance enhancements
* TINKERPOP-1953 Bump to Groovy 2.4.15
-
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 4dfbcaa..cb19a65 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -106,7 +106,7 @@ The build optionally requires link:https://www.microsoft.com/net/core[.NET Core
`gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will still build with Maven, but .NET projects
will be skipped.
-`gremlin-dotnet` can be build and tested from the command line with:
+`gremlin-dotnet` can be built and tested from the command line with:
[source,text]
mvn clean install -Pgremlin-dotnet
@@ -127,6 +127,20 @@ other existing Node.js runtime instances in your machine.
See the <<release-environment,Release Environment>> section for more information on release manager configurations.
+[[docker-environment]]
+=== Docker Environment
+The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console.
+
+The Docker images can be built from the command line with:
+[source,text]
+----
+mvn clean install -Pdocker-images
+----
+which enables the "docker-images" Maven profile or in a more automated fashion simply add a `.docker` file to the
+directories of the `gremlin-server` and/or `gremlin-console` modules which will signify to Maven that Docker is present
+in the environment.
+
+
[[release-environment]]
=== Release Environment
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 522bcfd..80659af 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -353,6 +353,38 @@ variable initialization code into the console.
Like, execution mode, it is also possible to pass multiple scripts by specifying multiple `-i` options. See the
<<execution-mode, Execution Mode Section>> for more information on the specifics of that capability.
+[[gremlin-console-docker-image]]
+=== Docker Image
+The Gremlin Console can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
+
+[source,text]
+----
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+Feb 25, 2018 3:47:24 PM java.util.prefs.FileSystemPreferences$1 run
+INFO: Created user preferences directory.
+
+ \,,,/
+ (o o)
+-----oOOo-(3)-oOOo-----
+plugin activated: tinkerpop.server
+plugin activated: tinkerpop.utilities
+plugin activated: tinkerpop.tinkergraph
+gremlin>
+----
+
+The Docker image offers the same options as the standalone Console. It can be used for example to execute scripts:
+
+[source,bash]
+----
+$ docker run -it tinkerpop/gremlin-console:x.y.z -e gremlin.groovy
+v[1]
+v[2]
+v[3]
+v[4]
+v[5]
+v[6]
+----
+
[[gremlin-server]]
== Gremlin Server
@@ -1901,6 +1933,63 @@ $ curl -X POST -d "{\"gremlin\":\"divideIt(8, 2)\"}" "http://localhost:8182"
In the above REST-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
immediately forget the script after execution. In this way, the function does not end up being globally available.
+[[gremlin-server-docker-image]]
+=== Docker Image
+The Gremlin Server can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
+
+[source,text]
+----
+$ docker run tinkerpop/gremlin-server:x.y.z
+[INFO] GremlinServer -
+ \,,,/
+ (o o)
+-----oOOo-(3)-oOOo-----
+
+[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
+[INFO] MetricManager - Configured Metrics ConsoleReporter configured with report interval=180000ms
+[INFO] MetricManager - Configured Metrics CsvReporter configured with report interval=180000ms to fileName=/tmp/gremlin-server-metrics.csv
+[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= and agentId=
+[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
+[INFO] DefaultGraphManager - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
+[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
+[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
+[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/empty-sample.groovy
+[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
+[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
+[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
+[INFO] OpLoader - Adding the standard OpProcessor.
+[INFO] OpLoader - Adding the control OpProcessor.
+[INFO] OpLoader - Adding the session OpProcessor.
+[INFO] OpLoader - Adding the traversal OpProcessor.
+[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
+[INFO] GremlinServer - Executing start up LifeCycleHook
+[INFO] Logger$info - Executed once at startup of Gremlin Server.
+[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
+[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo-stringd with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
+[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
+[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
+[INFO] GremlinServer$1 - Channel started at port 8182.
+----
+
+By default, Gremlin Server listens on port 8182. So that port should be exposed if it should be reachable on the host:
+
+[source,bash]
+----
+$ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z
+----
+
+Arguments provided with `docker run` are forwarded to the script that starts Gremlin Server. This allows for example
+to use an alternative config file:
+
+[source,bash]
+----
+$ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml
+----
+
[[gremlin-plugins]]
== Gremlin Plugins
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/Dockerfile
----------------------------------------------------------------------
diff --git a/gremlin-console/Dockerfile b/gremlin-console/Dockerfile
new file mode 100644
index 0000000..909952f
--- /dev/null
+++ b/gremlin-console/Dockerfile
@@ -0,0 +1,31 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM openjdk:8u151-jre-alpine3.7
+
+ARG GREMLIN_CONSOLE_DIR
+
+RUN apk add --update \
+ bash \
+ && rm -rf /var/cache/apk/*
+
+COPY src/main/docker/docker-entrypoint.sh /
+COPY ${GREMLIN_CONSOLE_DIR} /opt/gremlin-console
+
+WORKDIR /opt/gremlin-console
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 49e7f4a..b7933fb 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -335,5 +335,39 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>.docker</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docker-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>tinkerpop/gremlin-console</repository>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-console/src/main/docker/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/docker/docker-entrypoint.sh b/gremlin-console/src/main/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..2c8d204
--- /dev/null
+++ b/gremlin-console/src/main/docker/docker-entrypoint.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -e
+
+exec /opt/gremlin-console/bin/gremlin.sh "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/Dockerfile
----------------------------------------------------------------------
diff --git a/gremlin-server/Dockerfile b/gremlin-server/Dockerfile
new file mode 100644
index 0000000..c47e0cf
--- /dev/null
+++ b/gremlin-server/Dockerfile
@@ -0,0 +1,35 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM openjdk:8u151-jre-alpine3.7
+
+ARG GREMLIN_SERVER_DIR
+
+RUN apk add --update \
+ bash \
+ perl \
+ && rm -rf /var/cache/apk/*
+
+COPY src/main/docker/docker-entrypoint.sh /
+COPY ${GREMLIN_SERVER_DIR} /opt/gremlin-server
+
+WORKDIR /opt/gremlin-server
+
+EXPOSE 8182
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["conf/gremlin-server.yaml"]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 68733a9..dfc6570 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -243,5 +243,39 @@ limitations under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <file>
+ <exists>.docker</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docker-image</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repository>tinkerpop/gremlin-server</repository>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/gremlin-server/src/main/docker/docker-entrypoint.sh
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/docker/docker-entrypoint.sh b/gremlin-server/src/main/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..d869b8c
--- /dev/null
+++ b/gremlin-server/src/main/docker/docker-entrypoint.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set -e
+
+CONF_FILE=$1
+
+# IP substitution hack borrowed from:
+# https://github.com/htaox/NEAT/blob/94a004831cf89767e116d955192fc14ac82e5069/docker-scripts/gremlin-server-3.0.0/files/default_cmd#L5
+IP=$(ip -o -4 addr list eth0 | perl -n -e 'if (m{inet\s([\d\.]+)\/\d+\s}xms) { print $1 }')
+sed -i "s|^host:.*|host: $IP|" $CONF_FILE
+
+exec /opt/gremlin-server/bin/gremlin-server.sh "$@"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c4b507..5251de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,6 +319,7 @@ limitations under the License.
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
<exclude>**/.glv</exclude>
+ <exclude>**/.docker</exclude>
<exclude>bin/gremlin.sh</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
<exclude>**/Debug/**</exclude>
@@ -496,6 +497,11 @@ limitations under the License.
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>1.3.7</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[16/42] tinkerpop git commit: TINKERPOP-1897 Move snapshot detection
to root pom.xml
Posted by fl...@apache.org.
TINKERPOP-1897 Move snapshot detection to root pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd115177
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd115177
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd115177
Branch: refs/heads/tp32
Commit: fd115177f2c3ebe72adb308e4505a633dc49bbe7
Parents: c125fc9
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 25 +------------------------
gremlin-server/pom.xml | 25 +------------------------
pom.xml | 29 ++++++++++++++++++++++++-----
3 files changed, 26 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b24c772..db86d41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -345,30 +345,7 @@ limitations under the License.
</file>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
- <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
- to the project version otherwise -->
- <id>build-helper-regex-is-snapshot-used</id>
- <phase>validate</phase>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>only.when.is.snapshot.used</name>
- <value>${project.version}</value>
- <regex>.*-SNAPSHOT</regex>
- <replacement>true</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e71f79b..ef2e609 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -253,30 +253,7 @@ limitations under the License.
</file>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
- <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
- to the project version otherwise -->
- <id>build-helper-regex-is-snapshot-used</id>
- <phase>validate</phase>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>only.when.is.snapshot.used</name>
- <value>${project.version}</value>
- <regex>.*-SNAPSHOT</regex>
- <replacement>true</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 19866f0..9ff3f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,30 @@ limitations under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
@@ -502,11 +526,6 @@ limitations under the License.
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.3.7</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
[22/42] tinkerpop git commit: TINKERPOP-1897 Move snapshot detection
to root pom.xml
Posted by fl...@apache.org.
TINKERPOP-1897 Move snapshot detection to root pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd115177
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd115177
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd115177
Branch: refs/heads/tp33
Commit: fd115177f2c3ebe72adb308e4505a633dc49bbe7
Parents: c125fc9
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 25 +------------------------
gremlin-server/pom.xml | 25 +------------------------
pom.xml | 29 ++++++++++++++++++++++++-----
3 files changed, 26 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b24c772..db86d41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -345,30 +345,7 @@ limitations under the License.
</file>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
- <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
- to the project version otherwise -->
- <id>build-helper-regex-is-snapshot-used</id>
- <phase>validate</phase>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>only.when.is.snapshot.used</name>
- <value>${project.version}</value>
- <regex>.*-SNAPSHOT</regex>
- <replacement>true</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e71f79b..ef2e609 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -253,30 +253,7 @@ limitations under the License.
</file>
</activation>
<build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
- <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
- to the project version otherwise -->
- <id>build-helper-regex-is-snapshot-used</id>
- <phase>validate</phase>
- <goals>
- <goal>regex-property</goal>
- </goals>
- <configuration>
- <name>only.when.is.snapshot.used</name>
- <value>${project.version}</value>
- <regex>.*-SNAPSHOT</regex>
- <replacement>true</replacement>
- <failIfNoMatch>false</failIfNoMatch>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 19866f0..9ff3f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,30 @@ limitations under the License.
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
@@ -502,11 +526,6 @@ limitations under the License.
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.3.7</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.0.0</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
[29/42] tinkerpop git commit: Remove .docker file activation option
for Maven TINKERPOP-1897
Posted by fl...@apache.org.
Remove .docker file activation option for Maven TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0efeb4a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0efeb4a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0efeb4a2
Branch: refs/heads/tp33
Commit: 0efeb4a27cb0630cf71165e19681720a8f33ee84
Parents: 80931ce
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 23 20:33:19 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
.gitignore | 1 -
docker/hadoop/Dockerfile | 25 ++++++++++++++++++++
docker/scripts/build.sh | 3 ---
.../developer/development-environment.asciidoc | 4 +---
gremlin-console/pom.xml | 6 -----
gremlin-server/pom.xml | 6 -----
pom.xml | 1 -
7 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 10e5b4f..0109f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ __pycache__/
*.py[cdo]
__version__.py
.glv
-.docker
settings.xml
tools/
[Dd]ebug/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/hadoop/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile
new file mode 100644
index 0000000..86b2598
--- /dev/null
+++ b/docker/hadoop/Dockerfile
@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM tinkerpop:base
+
+MAINTAINER Daniel Kuppitz <me...@gremlin.guru>
+
+ENV HADOOP_VERSION 2.7.2
+
+COPY install.sh /usr/local/sbin/install-hadoop.sh
+RUN /usr/local/sbin/install-hadoop.sh
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 3d8f0d3..5ef74fc 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,9 +67,6 @@ touch gremlin-python/.glv
touch gremlin-dotnet/src/.glv
touch gremlin-dotnet/test/.glv
-rm gremlin-console/.docker
-rm gremlin-server/.docker
-
# use a custom maven settings.xml
if [ -r "settings.xml" ]; then
echo "Copying settings.xml"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index cb20d4e..ae97d1a 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -136,9 +136,7 @@ The Docker images can be built from the command line with:
----
mvn clean install -Pdocker-images
----
-which enables the "docker-images" Maven profile or in a more automated fashion simply add a `.docker` file to the
-directories of the `gremlin-server` and/or `gremlin-console` modules which will signify to Maven that Docker is present
-in the environment.
+which enables the "docker-images" Maven profile.
[[release-environment]]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 8e8b357..b5dca0e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,12 +338,6 @@ limitations under the License.
<profile>
<id>docker-images</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <file>
- <exists>.docker</exists>
- </file>
- </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index b2c3435..e361c9e 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -246,12 +246,6 @@ limitations under the License.
<profile>
<id>docker-images</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <file>
- <exists>.docker</exists>
- </file>
- </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 398b931..f2484f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,7 +349,6 @@ limitations under the License.
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
<exclude>**/.glv</exclude>
- <exclude>**/.docker</exclude>
<exclude>bin/gremlin.sh</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
<exclude>**/Debug/**</exclude>
[36/42] tinkerpop git commit: Add note to check Docker images before
a release TINKERPOP-1897
Posted by fl...@apache.org.
Add note to check Docker images before a release TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8232158e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8232158e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8232158e
Branch: refs/heads/tp32
Commit: 8232158eb51009ec0b434a4b46638c9149b14852
Parents: 0efeb4a
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 30 17:22:19 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8232158e/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 7963004..eef4e3f 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,8 @@ under release is protected. Tweaks to documentation and other odds and ends rela
during this period.
. At some point during the week:
.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`
-.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV pre-releases.
+.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -Pdocker-images`
+.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and Docker image pre-releases.
.. Review LICENSE and NOTICE files to make sure that no <<dependencies,changes are needed>>.
.. Review javadoc filters on the "Core API" docs to be sure nothing needs to change.
.. Review JIRA tickets in the release and ensure that:
[42/42] tinkerpop git commit: Merge branch 'tp33'
Posted by fl...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b0a68b8c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b0a68b8c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b0a68b8c
Branch: refs/heads/master
Commit: b0a68b8c04b3634d05abcecf6935d0626f7b6969
Parents: 8dba889 31a3b44
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Jun 4 16:05:13 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 16:05:13 2018 +0200
----------------------------------------------------------------------
.dockerignore | 2 +
CHANGELOG.asciidoc | 2 +-
docker/hadoop/Dockerfile | 25 ++++++++
.../developer/development-environment.asciidoc | 22 ++++++-
docs/src/dev/developer/release.asciidoc | 8 ++-
.../src/reference/gremlin-applications.asciidoc | 65 ++++++++++++++++++++
gremlin-console/Dockerfile | 31 ++++++++++
gremlin-console/pom.xml | 64 +++++++++++++++++++
.../src/main/docker/docker-entrypoint.sh | 24 ++++++++
.../gremlin/driver/ResultQueueTest.java | 2 +-
gremlin-server/Dockerfile | 35 +++++++++++
gremlin-server/pom.xml | 64 +++++++++++++++++++
.../src/main/docker/docker-entrypoint.sh | 31 ++++++++++
pom.xml | 35 +++++++++++
14 files changed, 406 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/gremlin-console/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/gremlin-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/pom.xml
----------------------------------------------------------------------
[41/42] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by fl...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31a3b444
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31a3b444
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31a3b444
Branch: refs/heads/master
Commit: 31a3b444ec290b3868337edb664348efbbd567ee
Parents: f2e74ff 6f6d941
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Jun 4 16:05:04 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 16:05:04 2018 +0200
----------------------------------------------------------------------
.dockerignore | 2 +
CHANGELOG.asciidoc | 2 +-
docker/hadoop/Dockerfile | 25 ++++++++
.../developer/development-environment.asciidoc | 22 ++++++-
docs/src/dev/developer/release.asciidoc | 8 ++-
.../src/reference/gremlin-applications.asciidoc | 65 ++++++++++++++++++++
gremlin-console/Dockerfile | 31 ++++++++++
gremlin-console/pom.xml | 64 +++++++++++++++++++
.../src/main/docker/docker-entrypoint.sh | 24 ++++++++
.../gremlin/driver/ResultQueueTest.java | 2 +-
gremlin-server/Dockerfile | 35 +++++++++++
gremlin-server/pom.xml | 64 +++++++++++++++++++
.../src/main/docker/docker-entrypoint.sh | 31 ++++++++++
pom.xml | 35 +++++++++++
14 files changed, 406 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 26ec185,273e5c7..bf0875a
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -2080,9 -1930,42 +2112,42 @@@ $ curl -X POST -d "{\"gremlin\":\"divid
{"message":"Error encountered evaluating script: divideIt(8, 2)"}
----
-In the above REST-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
+In the above HTTP-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to
immediately forget the script after execution. In this way, the function does not end up being globally available.
+ [[gremlin-server-docker-image]]
+ === Docker Image
+ The Gremlin Server can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
+
+ [source,text]
+ ----
+ $ docker run tinkerpop/gremlin-server:x.y.z
+ [INFO] GremlinServer -
+ \,,,/
+ (o o)
+ -----oOOo-(3)-oOOo-----
+
+ [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
+ ...
+ [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
+ [INFO] GremlinServer$1 - Channel started at port 8182.
+ ----
+
+ By default, Gremlin Server listens on port 8182. So that port needs to be exposed if it should be reachable on the host:
+
+ [source,bash]
+ ----
+ $ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z
+ ----
+
+ Arguments provided with `docker run` are forwarded to the script that starts Gremlin Server. This allows for example
+ to use an alternative config file:
+
+ [source,bash]
+ ----
+ $ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml
+ ----
+
[[gremlin-plugins]]
== Gremlin Plugins
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-console/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/pom.xml
----------------------------------------------------------------------
[21/42] tinkerpop git commit: Remove verbose log output TINKERPOP-1897
Posted by fl...@apache.org.
Remove verbose log output TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47f3c1cc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47f3c1cc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47f3c1cc
Branch: refs/heads/tp32
Commit: 47f3c1ccd697546ab2e5fd8d3c48904f53da1551
Parents: b829153
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
.../src/reference/gremlin-applications.asciidoc | 26 +-------------------
1 file changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47f3c1cc/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 80659af..e0896ef 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1946,31 +1946,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
-----oOOo-(3)-oOOo-----
[INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with report interval=180000ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report interval=180000ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with interval=180000ms and loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via [conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool. Threads in pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with size 1000 and expiration time of 600000 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo-stringd with org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
-[INFO] AbstractChannelizer - Configured application/json with org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
[INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1.
[INFO] GremlinServer$1 - Channel started at port 8182.
----
[13/42] tinkerpop git commit: Add description about Docker
credentials TINKERPOP-1897
Posted by fl...@apache.org.
Add description about Docker credentials TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d2faa27
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d2faa27
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d2faa27
Branch: refs/heads/tp33
Commit: 5d2faa2759417ce3a5b1749d573707308523d191
Parents: 47f3c1c
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d2faa27/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index cb19a65..c50b189 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,6 +197,11 @@ authentication information on the ~/.npmrc file. The easiest way to do that is t
must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with `mvn dockerfile:push`.
+
[[building-testing]]
== Building and Testing
[38/42] tinkerpop git commit: TINKERPOP-1897 Added -D equivalent of
docker mvn profile and disabled jvm artifact deployment in that profile.
Posted by fl...@apache.org.
TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm artifact deployment in that profile.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f6d9417
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f6d9417
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f6d9417
Branch: refs/heads/master
Commit: 6f6d9417a4c938f42b8260b8bd5328d147106a0e
Parents: 8232158
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 4 09:26:22 2018 -0400
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:30 2018 +0200
----------------------------------------------------------------------
.../developer/development-environment.asciidoc | 9 +++++----
docs/src/dev/developer/release.asciidoc | 6 +++---
gremlin-console/pom.xml | 18 +++++++++++++++++-
gremlin-server/pom.xml | 18 +++++++++++++++++-
4 files changed, 42 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index ae97d1a..6b1dbd6 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -129,15 +129,16 @@ See the <<release-environment,Release Environment>> section for more information
[[docker-environment]]
=== Docker Environment
-The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console.
-The Docker images can be built from the command line with:
+The build optionally requires Docker to build Docker images of Gremlin Server and Gremlin Console. The Docker images
+can be built from the command line with:
+
[source,text]
----
-mvn clean install -Pdocker-images
+mvn clean install -pl gremlin-server,gremlin-console -DdockerImages
----
-which enables the "docker-images" Maven profile.
+which enables the "docker-images" Maven profile.
[[release-environment]]
=== Release Environment
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index eef4e3f..5496b31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,7 @@ under release is protected. Tweaks to documentation and other odds and ends rela
during this period.
. At some point during the week:
.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`
-.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -Pdocker-images`
+.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -DdockerImages`
.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and Docker image pre-releases.
.. Review LICENSE and NOTICE files to make sure that no <<dependencies,changes are needed>>.
.. Review javadoc filters on the "Core API" docs to be sure nothing needs to change.
@@ -235,8 +235,8 @@ for generating javadoc and without that the binary distributions won't contain t
. Review the GLV releases at link:https://pypi.org/project/gremlinpython/[PyPi],
link:https://www.nuget.org/packages/Gremlin.Net/[nuget] and link:https://www.npmjs.com/package/gremlin[npm]
. Deploy the Docker images
-.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
-.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-console -DskipTests -DdockerImages`
+.. `mvn deploy -pl gremlin-server -DskipTests -DdockerImages`
. Review the deployed Docker images at link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; svn up dev/xx.yy.zz`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b5dca0e..748360c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,8 +338,24 @@ limitations under the License.
<profile>
<id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>dockerImages</name>
+ </property>
+ </activation>
<build>
- <plugins>
+ <plugins>
+ <!--
+ Deploying docker images will happen out of the normal jvm artifact deployment flow, so disable that
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e361c9e..0d68e7b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -246,8 +246,24 @@ limitations under the License.
<profile>
<id>docker-images</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>dockerImages</name>
+ </property>
+ </activation>
<build>
- <plugins>
+ <plugins>
+ <!--
+ Deploying docker images will happen out of the normal jvm artifact deployment flow, so disable that
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
[20/42] tinkerpop git commit: Add description about Docker
credentials TINKERPOP-1897
Posted by fl...@apache.org.
Add description about Docker credentials TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d2faa27
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d2faa27
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d2faa27
Branch: refs/heads/tp32
Commit: 5d2faa2759417ce3a5b1749d573707308523d191
Parents: 47f3c1c
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/development-environment.asciidoc | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d2faa27/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index cb19a65..c50b189 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,6 +197,11 @@ authentication information on the ~/.npmrc file. The easiest way to do that is t
must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the `docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with `mvn dockerfile:push`.
+
[[building-testing]]
== Building and Testing
[10/42] tinkerpop git commit: Add note to check Docker images before
a release TINKERPOP-1897
Posted by fl...@apache.org.
Add note to check Docker images before a release TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8232158e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8232158e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8232158e
Branch: refs/heads/master
Commit: 8232158eb51009ec0b434a4b46638c9149b14852
Parents: 0efeb4a
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 30 17:22:19 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8232158e/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 7963004..eef4e3f 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,8 @@ under release is protected. Tweaks to documentation and other odds and ends rela
during this period.
. At some point during the week:
.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`
-.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV pre-releases.
+.. Build and test the Docker images: `mvn clean install -pl gremlin-server,gremlin-console -Pdocker-images`
+.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and Docker image pre-releases.
.. Review LICENSE and NOTICE files to make sure that no <<dependencies,changes are needed>>.
.. Review javadoc filters on the "Core API" docs to be sure nothing needs to change.
.. Review JIRA tickets in the release and ensure that:
[25/42] tinkerpop git commit: TINKERPOP-1897 Avoid pushing of Docker
images for SNAPSHOT versions
Posted by fl...@apache.org.
TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions
This also adds the minor version as an additional tag for Docker images
when the version is not a SNAPSHOT version.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9c3d0f00
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9c3d0f00
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9c3d0f00
Branch: refs/heads/master
Commit: 9c3d0f00fd77a80ba9f5df4eb49b850110adb4e7
Parents: 5d2faa2
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed Mar 14 22:41:55 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:29 2018 +0200
----------------------------------------------------------------------
gremlin-console/pom.xml | 61 +++++++++++++++++++++++++++++++++++++-------
gremlin-server/pom.xml | 53 ++++++++++++++++++++++++++++++++++----
pom.xml | 5 ++++
3 files changed, 105 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b7933fb..b24c772 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -347,23 +347,66 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<execution>
- <id>docker-image</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
+ <id>docker-image-build</id>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
+ </buildArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-tag-minor-version</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <tag>3.2</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-push</id>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ <configuration>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>tinkerpop/gremlin-console</repository>
- <tag>${project.version}</tag>
- <buildArgs>
- <GREMLIN_CONSOLE_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_CONSOLE_DIR>
- </buildArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dfc6570..e71f79b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -255,23 +255,66 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+ <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT was used,
+ to the project version otherwise -->
+ <id>build-helper-regex-is-snapshot-used</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>only.when.is.snapshot.used</name>
+ <value>${project.version}</value>
+ <regex>.*-SNAPSHOT</regex>
+ <replacement>true</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<execution>
- <id>docker-image</id>
+ <id>docker-image-build</id>
<goals>
<goal>build</goal>
+ </goals>
+ <configuration>
+ <tag>${project.version}</tag>
+ <buildArgs>
+ <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
+ </buildArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-tag-minor-version</id>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <tag>3.2</tag>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>docker-image-push</id>
+ <goals>
<goal>push</goal>
</goals>
+ <configuration>
+ <skip>${only.when.is.snapshot.used}</skip>
+ </configuration>
</execution>
</executions>
<configuration>
<repository>tinkerpop/gremlin-server</repository>
- <tag>${project.version}</tag>
- <buildArgs>
- <GREMLIN_SERVER_DIR>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone</GREMLIN_SERVER_DIR>
- </buildArgs>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5251de3..19866f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -502,6 +502,11 @@ limitations under the License.
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.3.7</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
[07/42] tinkerpop git commit: Increase test timeout for slow systems
TINKERPOP-1897
Posted by fl...@apache.org.
Increase test timeout for slow systems TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b8291539
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b8291539
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b8291539
Branch: refs/heads/tp33
Commit: b8291539c7b638f499fe184fd733f1973d408f7e
Parents: a5f1f74
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Thu Mar 1 17:17:11 2018 +0100
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Mon Jun 4 15:57:28 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8291539/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index a7e6066..43442be 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -281,7 +281,7 @@ public class ResultQueueTest extends AbstractResultQueueTest {
latch.countDown();
});
- assertThat(latch.await(3000, TimeUnit.MILLISECONDS), is(true));
+ assertThat(latch.await(10000, TimeUnit.MILLISECONDS), is(true));
assertEquals(500, count1.get());
assertEquals(150, count2.get());