You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/07 13:25:23 UTC
[41/50] [abbrv] incubator-tinkerpop git commit: Break up gremlin
console/server assembly creation into separate executions.
Break up gremlin console/server assembly creation into separate executions.
This rids maven log output of a warning with respect to trying to attache a directory (i.e. the standalone directory) as an artifact.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b7ed67a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b7ed67a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b7ed67a9
Branch: refs/heads/variables
Commit: b7ed67a9a56fbf4006419472246a7565a08dd56b
Parents: 8007630
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 6 12:46:07 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 6 12:46:07 2015 -0400
----------------------------------------------------------------------
gremlin-console/pom.xml | 25 +++++++++++---
gremlin-console/src/assembly/distribution.xml | 31 ++++++++----------
gremlin-server/pom.xml | 25 +++++++++++---
gremlin-server/src/assembly/distribution.xml | 38 ++++++++++++----------
4 files changed, 74 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b7ed67a9/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 6479b18..d66d128 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -111,18 +111,33 @@ limitations under the License.
<version>2.4</version>
<executions>
<execution>
+ <id>package-standalone</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>src/assembly/standalone.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>package-distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>src/assembly/distribution.xml</descriptor>
+ </descriptors>
+ </configuration>
</execution>
</executions>
<configuration>
- <attach>true</attach>
- <descriptors>
- <descriptor>src/assembly/standalone.xml</descriptor>
- <descriptor>src/assembly/distribution.xml</descriptor>
- </descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
<outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b7ed67a9/gremlin-console/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/src/assembly/distribution.xml b/gremlin-console/src/assembly/distribution.xml
index 78d8603..ab89686 100644
--- a/gremlin-console/src/assembly/distribution.xml
+++ b/gremlin-console/src/assembly/distribution.xml
@@ -21,36 +21,33 @@ limitations under the License.
</formats>
<fileSets>
<fileSet>
- <fileMode>0775</fileMode>
- <directory>target/${project.artifactId}-${project.version}-standalone/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- </includes>
+ <directory>src/main/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>conf</directory>
+ <outputDirectory>/conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/data</directory>
- <outputDirectory>data</outputDirectory>
+ <directory>src/main/ext</directory>
+ <outputDirectory>/ext</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/docs</directory>
- <outputDirectory>docs</outputDirectory>
+ <directory>../data</directory>
+ <outputDirectory>/data</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/javadocs</directory>
- <outputDirectory>javadocs</outputDirectory>
+ <directory>../target/docs/htmlsingle</directory>
+ <outputDirectory>/docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/ext</directory>
- <outputDirectory>ext</outputDirectory>
+ <directory>../target/site/apidocs</directory>
+ <outputDirectory>/javadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/lib</directory>
- <outputDirectory>lib</outputDirectory>
+ <directory>target/*.jar</directory>
+ <outputDirectory>/lib</outputDirectory>
</fileSet>
</fileSets>
<files>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b7ed67a9/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 7171539..dd2d34a 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -107,18 +107,33 @@ limitations under the License.
<version>2.4</version>
<executions>
<execution>
+ <id>package-standalone</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>src/assembly/standalone.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ <execution>
+ <id>package-distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>src/assembly/distribution.xml</descriptor>
+ </descriptors>
+ </configuration>
</execution>
</executions>
<configuration>
- <attach>true</attach>
- <descriptors>
- <descriptor>src/assembly/standalone.xml</descriptor>
- <descriptor>src/assembly/distribution.xml</descriptor>
- </descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
<outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b7ed67a9/gremlin-server/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/assembly/distribution.xml b/gremlin-server/src/assembly/distribution.xml
index 618b538..3844be9 100644
--- a/gremlin-server/src/assembly/distribution.xml
+++ b/gremlin-server/src/assembly/distribution.xml
@@ -21,39 +21,41 @@ limitations under the License.
</formats>
<fileSets>
<fileSet>
- <fileMode>0775</fileMode>
- <directory>target/${project.artifactId}-${project.version}-standalone/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>*.sh</include>
- <include>*.bat</include>
- </includes>
+ <directory>src/main/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>conf</directory>
+ <directory>src/main/ext</directory>
+ <outputDirectory>/ext</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/data</directory>
- <outputDirectory>data</outputDirectory>
+ <directory>conf</directory>
+ <outputDirectory>/conf</outputDirectory>
</fileSet>
<fileSet>
<directory>scripts</directory>
+ <outputDirectory>/scripts</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../target/docs/htmlsingle</directory>
+ <outputDirectory>/docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/ext</directory>
- <outputDirectory>ext</outputDirectory>
+ <directory>../target/site/apidocs</directory>
+ <outputDirectory>/javadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/docs</directory>
- <outputDirectory>docs</outputDirectory>
+ <directory>target/*.jar</directory>
+ <outputDirectory>/lib</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/javadocs</directory>
- <outputDirectory>javadocs</outputDirectory>
+ <directory>data</directory>
+ <outputDirectory>/data</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/${project.artifactId}-${project.version}-standalone/lib</directory>
- <outputDirectory>lib</outputDirectory>
+ <directory>../data</directory>
+ <outputDirectory>/data</outputDirectory>
</fileSet>
</fileSets>
<files>