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:19:15 UTC
[37/42] tinkerpop git commit: TINKERPOP-1897 Added -D equivalent of
docker mvn profile and disabled jvm artifact deployment in that profile.
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>