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/05/23 18:40:44 UTC
[1/2] tinkerpop git commit: Remove .docker file activation option for
Maven TINKERPOP-1897
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1897 579bc446c -> cf2166b45
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/8a9a1cab
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8a9a1cab
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8a9a1cab
Branch: refs/heads/TINKERPOP-1897
Commit: 8a9a1cabb1bb5159c30c33a42f2e78004c9f803d
Parents: 579bc44
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 23 20:33:19 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Wed May 23 20:33:19 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/8a9a1cab/.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/8a9a1cab/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/8a9a1cab/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/8a9a1cab/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/8a9a1cab/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/8a9a1cab/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/8a9a1cab/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>
[2/2] 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/cf2166b4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cf2166b4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cf2166b4
Branch: refs/heads/TINKERPOP-1897
Commit: cf2166b450da30b6e14ea364f73c78e922190f18
Parents: 8a9a1ca
Author: Florian Hockmann <fh...@florian-hockmann.de>
Authored: Wed May 23 20:33:56 2018 +0200
Committer: Florian Hockmann <fh...@florian-hockmann.de>
Committed: Wed May 23 20:33:56 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/cf2166b4/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 7963004..aa9eb09 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.
+.. 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: