Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81ef1955 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81ef1955 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81ef1955 Branch: refs/heads/TINKERPOP-1278 Commit: 81ef195556bd28cf66fb970e62d412916fefbf64 Parents: 7cd1f6a 6bf0d3b Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Aug 3 11:58:16 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Aug 3 11:58:16 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + bin/validate-distribution.sh | 4 ++-- docs/src/dev/developer/release.asciidoc | 2 +- gremlin-console/pom.xml | 2 +- gremlin-console/src/assembly/distribution.xml | 16 ++++++++-------- gremlin-server/pom.xml | 2 +- gremlin-server/src/assembly/distribution.xml | 12 ++++++------ 7 files changed, 20 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ef1955/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ef1955/gremlin-console/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ef1955/gremlin-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ef1955/gremlin-server/src/assembly/distribution.xml ---------------------------------------------------------------------- diff --cc gremlin-server/src/assembly/distribution.xml index 5210848,e132a81..43eabd9 --- a/gremlin-server/src/assembly/distribution.xml +++ b/gremlin-server/src/assembly/distribution.xml @@@ -41,11 -41,10 +41,11 @@@ limitations under the License <outputDirectory>data</outputDirectory> </fileSet> <fileSet> - <directory>scripts</directory> + <directory>target/apache-${project.artifactId}-${project.version}-standalone/scripts</directory> + <outputDirectory>scripts</outputDirectory> </fileSet> <fileSet> - <directory>target/apache-${project.artifactId}-${project.version}-standalone/ext</directory> + <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/ext</directory> <outputDirectory>ext</outputDirectory> </fileSet> <fileSet>
